diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index e37235f..d70c01d 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -8,6 +8,10 @@ on:
       - main
       - ci-test
 
+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+
 jobs:
   unit-tests:
     name: "Run unit tests"
@@ -18,6 +22,10 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
+      - name: "Run dockerd"
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
       - name: "Run DB container"
         run: |
           docker compose -f test/compose.yml up --wait
@@ -27,9 +35,6 @@ jobs:
         run: |
           git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
       - name: "Run tests"
-        env:
-          DATABASE_HOSTNAME: gitea.local
-          DATABASE_PORT: 8077
         run: go test -v ./...
 
   integration-tests:
@@ -45,8 +50,11 @@ jobs:
           repository: cerc-io/plugeth
           ref: statediff-wip
           path: ./plugeth
+      - name: "Run dockerd"
+        run: dockerd -H $DOCKER_HOST --userland-proxy=false &
         # These images need access tokens configured
       - name: "Build docker image"
+        if: false
         env:
           TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
         run: |