diff --git a/.gitea/workflows/dockerbuild.yml b/.gitea/workflows/dockerbuild.yml
index 4df4475..5f9cf30 100644
--- a/.gitea/workflows/dockerbuild.yml
+++ b/.gitea/workflows/dockerbuild.yml
@@ -1,51 +1,42 @@
 name: Build and Push Docker Image
+
 on:
   push:
     branches: [ main ]
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      
-      - name: Fix Docker Socket Permissions
-        run: |
-          # Check current socket permissions
-          ls -la /var/run/docker.sock
-          
-          # Fix socket permissions (if needed)
-          if [ -S /var/run/docker.sock ]; then
-            sudo chmod 666 /var/run/docker.sock
-            echo "Fixed socket permissions"
-          fi
-          
-          # Test access
-          docker info || echo "Still having issues"
 
-      - name: Add User to Docker Group and Refresh
-        run: |
-          sudo usermod -aG docker $USER
-          echo "Current user groups: $(groups)"
-          # Refresh the group membership for the current shell
-          newgrp docker << 'EOF'
-          echo "Testing with new group membership..."
-          docker info
-          EOF
-       
+    steps:
+      - uses: actions/checkout@v4
+
       - name: Login to Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: git.phyllo.me
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
-      
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: |
-            git.phyllo.me/devops/fedora-runner-image:${{ github.ref_name }}-${{ github.sha }}
-            git.phyllo.me/devops/fedora-runner-image:${{ github.ref_name }}-latest
-          build-args: |
-            BUILD_IDENTIFIER=${{ github.sha }}
\ No newline at end of file
+
+      - name: Build Docker Image
+        env:
+          BRANCH_NAME: ${{ github.ref_name }}
+          SHORT_HASH: ${{ github.sha }}
+        run: |
+          # Build the image with the commit hash tag
+          docker build --build-arg BUILD_IDENTIFIER=${SHORT_HASH:0:5} -t https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-${SHORT_HASH:0:5} .
+
+          # Tag the same image as "latest"
+          docker tag https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-${SHORT_HASH:0:5} https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-latest
+
+      - name: Push Docker Images
+        env:
+          BRANCH_NAME: ${{ github.ref_name }}
+          SHORT_HASH: ${{ github.sha }}
+        run: |
+          docker push https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-${SHORT_HASH:0:5}
+          docker push https://git.phyllo.me/devops/fedora-runner-image:${BRANCH_NAME}-latest
+
+      - name: Log out from registry
+        if: always()
+        run: docker logout git.phyllo.me