diff --git a/.forgejo/workflows/lint-and-build.yml b/.forgejo/workflows/lint-and-build.yml
index 6337d65..9f6331d 100644
--- a/.forgejo/workflows/lint-and-build.yml
+++ b/.forgejo/workflows/lint-and-build.yml
@@ -89,14 +89,13 @@ jobs:
         run: |
           apt-get update
           apt-get install -y pkg-config libssl-dev
-          rustup component add clippy
       
       - name: Build release binary
         working-directory: ./backend
         run: cargo build --release --verbose
 
   # ==============================================================================
-  # Job 4: Docker Build - Uses DinD with Buildx
+  # Job 4: Docker Build - Simple docker build
   # ==============================================================================
   docker-build:
     runs-on: docker
@@ -106,15 +105,10 @@ jobs:
         - /var/run/docker.sock:/var/run/docker.sock
     needs: [build]
     
-    services:
-      docker:
-        image: docker:dind
-        command: ["dockerd", "--host=tcp://0.0.0.0:2375", "--tls=false"]
-        options: >-
-          --privileged
-          -e DOCKER_TLS_CERTDIR=
-    
     steps:
+      - name: Install Node.js for checkout
+        run: apk add --no-cache nodejs npm
+      
       - name: Checkout code
         uses: actions/checkout@v4
       
@@ -123,31 +117,14 @@ jobs:
           docker version
           docker info
       
-      - name: Set up Docker Buildx
-        run: |
-          docker buildx version
-          docker buildx create --use --name builder --driver docker --driver-opt network=host
-          docker buildx inspect --bootstrap
-      
-      - name: Build Docker image with Buildx
+      - name: Build Docker image
         working-directory: ./backend
         run: |
-          docker buildx build \
-            --file docker/Dockerfile \
-            --tag normogen-backend:${{ github.sha }} \
-            --tag normogen-backend:latest \
-            --cache-from type=local,src=/tmp/.buildx-cache \
-            --cache-to type=local,dest=/tmp/.buildx-cache-new,mode=max \
-            --load \
-            .
-          
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache || true
+          docker build -f docker/Dockerfile -t normogen-backend:${{ github.sha }} -t normogen-backend:latest .
       
       - name: Test Docker image
         run: |
-          docker run --rm normogen-backend:${{ github.sha }} \
-            ls -la /app/normogen-backend || echo "Binary check"
+          docker run --rm normogen-backend:${{ github.sha }} ls -la /app/normogen-backend || echo "Binary check"
       
       - name: Show image info
         run: |