diff --git a/.github/workflows/docker-minimal.yml b/.github/workflows/docker-minimal.yml
new file mode 100644
index 00000000..44325890
--- /dev/null
+++ b/.github/workflows/docker-minimal.yml
@@ -0,0 +1,21 @@
+---
+name: 'Build minimal docker image'
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  docker_test:
+    name: docker_test
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - run: cd docker/wforce_image && docker buildx build -f Dockerfile.minimal weakforced -t powerdns/wforce-minimal:`git describe --tags` --load
+      - run: cd docker && bash docker_push.sh "powerdns/wforce-minimal"
+        env:
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 06d66801..b36a8e5c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,5 +1,5 @@
 ---
-name: 'Run docker tests'
+name: 'Build docker image and test'
 
 on:
   push:
@@ -32,9 +32,4 @@ jobs:
       - run: cd docker && bash docker_push.sh "powerdns/wforce"
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      - run: cd docker/wforce_image && docker buildx build -f Dockerfile.minimal weakforced -t powerdns/wforce-minimal:`git describe --tags` --load
-      - run: cd docker && bash docker_push.sh "powerdns/wforce-minimal"
-        env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
\ No newline at end of file