diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5264d8e..77098a0 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,13 +1,14 @@
 when:
-  branch: main
+  - branch: main
+    event: push
 
 steps:
   build-forgejo:
     image: docker:latest
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    secrets:
-      - forgejo_registry_token
+    environment:
+      DOCKER_HOST: tcp://docker:2375
+      FORGEJO_REGISTRY_TOKEN:
+        from_secret: forgejo_registry_token
     commands:
       - docker login forgejo.corentic.eu -u tobi -p $FORGEJO_REGISTRY_TOKEN
       - docker build -t forgejo.corentic.eu/corentic/mcp-fleet-forgejo:latest -f forgejo/Dockerfile forgejo/
@@ -15,10 +16,10 @@ steps:
 
   build-woodpecker:
     image: docker:latest
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    secrets:
-      - forgejo_registry_token
+    environment:
+      DOCKER_HOST: tcp://docker:2375
+      FORGEJO_REGISTRY_TOKEN:
+        from_secret: forgejo_registry_token
     commands:
       - docker login forgejo.corentic.eu -u tobi -p $FORGEJO_REGISTRY_TOKEN
       - docker build -t forgejo.corentic.eu/corentic/mcp-fleet-woodpecker:latest -f woodpecker/Dockerfile woodpecker/
@@ -26,10 +27,10 @@ steps:
 
   build-semaphore:
     image: docker:latest
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    secrets:
-      - forgejo_registry_token
+    environment:
+      DOCKER_HOST: tcp://docker:2375
+      FORGEJO_REGISTRY_TOKEN:
+        from_secret: forgejo_registry_token
     commands:
       - docker login forgejo.corentic.eu -u tobi -p $FORGEJO_REGISTRY_TOKEN
       - docker build -t forgejo.corentic.eu/corentic/mcp-fleet-semaphore:latest -f semaphore/Dockerfile semaphore/
@@ -37,11 +38,15 @@ steps:
 
   build-github:
     image: docker:latest
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    secrets:
-      - forgejo_registry_token
+    environment:
+      DOCKER_HOST: tcp://docker:2375
+      FORGEJO_REGISTRY_TOKEN:
+        from_secret: forgejo_registry_token
     commands:
       - docker login forgejo.corentic.eu -u tobi -p $FORGEJO_REGISTRY_TOKEN
       - docker build -t forgejo.corentic.eu/corentic/mcp-fleet-github:latest -f github/Dockerfile github/
       - docker push forgejo.corentic.eu/corentic/mcp-fleet-github:latest
+
+services:
+  docker:
+    image: docker:27-dind