diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index f916cf7..2b42988 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -18,15 +18,9 @@ jobs:
       FLOWZONE_TOKEN: ${{ secrets.FLOWZONE_TOKEN }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-      DOCKER_REGISTRY_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
-      DOCKER_REGISTRY_PASS: ${{ secrets.DOCKER_REGISTRY_PASS }}
+      DOCKERHUB_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKER_REGISTRY_PASS }}
     with:
-      protect_branch: false
-      skip_versioning: true
-      docker_platforms: |
-        linux/amd64
-        linux/arm64
-        linux/arm/v7
-        linux/arm/v6
-      dockerhub_repo: klutchell/unbound
-      ghcr_repo: klutchell/unbound
+      docker_images: |
+        ghcr.io/klutchell/unbound,
+        docker.io/klutchell/unbound
diff --git a/docker-bake.hcl b/docker-bake.hcl
new file mode 100644
index 0000000..662e849
--- /dev/null
+++ b/docker-bake.hcl
@@ -0,0 +1,14 @@
+// https://github.com/docker/metadata-action#bake-definition
+target "docker-metadata-action" {}
+
+target "build" {
+  inherits = ["docker-metadata-action"]
+  context = "./"
+  dockerfile = "Dockerfile"
+  platforms = [
+    "linux/amd64",
+    "linux/arm/v7",
+    "linux/arm/v6",
+    "linux/arm64"
+  ]
+}
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 675b882..60e8c37 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -4,12 +4,18 @@ services:
 
   server:
     image: sut
+    build:
+      context: .
+      dockerfile: Dockerfile
     networks:
       - internal
     command: -v -v -v
 
   version:
     image: sut
+    build:
+      context: .
+      dockerfile: Dockerfile
     networks:
       - internal
     command: -V
@@ -22,7 +28,7 @@ services:
       - server
     entrypoint: ""
     command: >-
-      sh -c '
+      /bin/sh -c '
       apk add --no-cache bind-tools &&
       dig sigok.verteiltesysteme.net @server +dnssec | tee /dev/stderr | grep -wq NOERROR &&
       dig sigfail.verteiltesysteme.net @server +dnssec | tee /dev/stderr | grep -wq SERVFAIL
diff --git a/docker-compose.yml b/docker-compose.yml
index 05cfb22..ff8cac4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 
 services:
-  sut:
+  server:
     build:
       context: .
       dockerfile: Dockerfile