diff --git a/.forgejo/workflows/lint-and-build.yml b/.forgejo/workflows/lint-and-build.yml
index cbe9910..3cf02ca 100644
--- a/.forgejo/workflows/lint-and-build.yml
+++ b/.forgejo/workflows/lint-and-build.yml
@@ -8,9 +8,6 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  # Configure Docker CLI to use the DinD service
-  DOCKER_HOST: tcp://docker-in-dinner:2375
-  DOCKER_TLS_CERTDIR: ""
 
 jobs:
   lint:
@@ -87,26 +84,25 @@ jobs:
   docker-build:
     runs-on: docker
     container:
-      image: docker:dind
+      image: docker:cli
+    env:
+      DOCKER_HOST: tcp://docker-in-dinner:2375
+      DOCKER_TLS_CERTDIR: ""
     needs: build
     
     steps:
       - name: Verify Docker connection
         run: |
+          echo "DOCKER_HOST: $DOCKER_HOST"
           echo "Docker version:"
-          docker --version || true
+          docker --version
           echo "Docker info:"
-          docker info || true
+          docker info
           echo "Docker ps:"
-          docker ps || true
+          docker ps
 
       - uses: https://github.com/actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        run: |
-          docker buildx version || true
-          docker buildx create --use || true
-
       - name: Build Docker image
         working-directory: ./backend
         run: |