diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index bcac97dd9..509125caa 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -21,5 +21,10 @@ jobs:
     secrets: inherit
     with:
       docker_images: balena/open-balena-api
+      docker_runs_on: >
+        {
+          "linux/amd64": ["self-hosted","X64"],
+          "linux/arm64": ["self-hosted","ARM64"]
+        }
       # This allows external PRs to run custom actions so the custom actions must be safe to run in that context
       restrict_custom_actions: false
diff --git a/docker-bake.hcl b/docker-bake.hcl
new file mode 100644
index 000000000..3514664f8
--- /dev/null
+++ b/docker-bake.hcl
@@ -0,0 +1,8 @@
+
+target "default" {
+  target = "runtime"
+  platforms = [
+    "linux/amd64",
+    "linux/arm64"
+  ]
+}