diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fef36e46..a6b7b4e2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,7 +29,12 @@ jobs:
       - run: ./configure --enable-docker --disable-dns --disable-sodium --disable-geoip
       - run: cd docker/wforce_image && make test_wforce_image
       - run: cd docker/wforce_image && make build_wforce_image
-      - run: cd docker && bash docker_push.sh
+      - 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 && TAG=`git describe --tags` docker buildx build -f Dockerfile.minimal weakforced -t powerdns/wforce-minimal:$TAG --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/docker/docker_push.sh b/docker/docker_push.sh
index fa43f9c2..9b24fea7 100755
--- a/docker/docker_push.sh
+++ b/docker/docker_push.sh
@@ -14,7 +14,7 @@ push_tag()
   local tag=$1
   echo "Docker username is: '"$DOCKER_USERNAME"'"
   docker_login
-  docker push powerdns/wforce:$tag
+  docker push $IMAGE:$tag
 }
 
 TAG=`git describe --tags`
@@ -24,10 +24,12 @@ then
     push_tag $TAG
 fi
 
+IMAGE=$1
+
 BRANCH=`git branch --show-current`
 if [ "$BRANCH" = "master" ]
 then
-    docker tag powerdns/wforce:$TAG powerdns/wforce:unstable
+    docker tag $IMAGE:$TAG $IMAGE:unstable
     push_tag unstable
 fi