diff --git a/.forgejo/workflows/docker-publish-semantic.yml b/.forgejo/workflows/docker-publish-semantic.yml
index 7ad8bec..54a1f94 100644
--- a/.forgejo/workflows/docker-publish-semantic.yml
+++ b/.forgejo/workflows/docker-publish-semantic.yml
@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY: bitfreedom.net
+  REGISTRY: bitfreedom.net/code
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
@@ -37,12 +37,15 @@ jobs:
 
       - name: Start Docker daemon
         run: |
-          dockerd &
+          dockerd --host=unix:///var/run/docker.sock --iptables=false > /tmp/dockerd.log 2>&1 &
           for i in $(seq 1 30); do
-            docker info && break
-            echo "Waiting for Docker daemon... ($i/30)"
             sleep 2
+            docker info > /dev/null 2>&1 && echo "Docker daemon ready" && exit 0
+            echo "Waiting for Docker daemon... ($i/30)"
           done
+          echo "=== dockerd failed to start, logs: ==="
+          cat /tmp/dockerd.log
+          exit 1
 
       - name: Checkout repository
         run: |
diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml
index 5a10f7a..ecd4e12 100644
--- a/.forgejo/workflows/docker-publish.yml
+++ b/.forgejo/workflows/docker-publish.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY: bitfreedom.net
+  REGISTRY: bitfreedom.net/code
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
@@ -30,12 +30,15 @@ jobs:
 
       - name: Start Docker daemon
         run: |
-          dockerd &
+          dockerd --host=unix:///var/run/docker.sock --iptables=false > /tmp/dockerd.log 2>&1 &
           for i in $(seq 1 30); do
-            docker info && break
-            echo "Waiting for Docker daemon... ($i/30)"
             sleep 2
+            docker info > /dev/null 2>&1 && echo "Docker daemon ready" && exit 0
+            echo "Waiting for Docker daemon... ($i/30)"
           done
+          echo "=== dockerd failed to start, logs: ==="
+          cat /tmp/dockerd.log
+          exit 1
 
       - name: Checkout repository
         run: |