diff --git a/.forgejo/workflows/lint-and-build.yml b/.forgejo/workflows/lint-and-build.yml
index 9f6331d..31853d0 100644
--- a/.forgejo/workflows/lint-and-build.yml
+++ b/.forgejo/workflows/lint-and-build.yml
@@ -95,16 +95,22 @@ jobs:
         run: cargo build --release --verbose
 
   # ==============================================================================
-  # Job 4: Docker Build - Simple docker build
+  # Job 4: Docker Build - Using DinD
   # ==============================================================================
   docker-build:
     runs-on: docker
     container:
       image: docker:cli
-      volumes:
-        - /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
@@ -112,6 +118,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       
+      - name: Set DOCKER_HOST environment
+        run: echo "DOCKER_HOST=tcp://docker:2375" >> $GITHUB_ENV
+      
       - name: Verify Docker is available
         run: |
           docker version