diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 261623480..7b7208f9e 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -1371,7 +1371,7 @@ jobs:
             const { execSync } = require('child_process');
 
             const tempBakeFile = process.env.TEMP_BAKE_FILE;
-            const bakeTargets = process.env.BAKE_TARGETS.trim().replace(/\s+/g,',').split(',');
+            const bakeTargets = process.env.BAKE_TARGETS.trim().replace(/[\s,]+/g,',').split(',');
             const bakeFiles = JSON.parse(process.env.ALL_FILES)
               .filter(f => f.match(/docker-bake(\.override)?\.(json|hcl)/))
               .map(f => path.join(process.env.WORKDIR.trim(), f));
@@ -1512,7 +1512,7 @@ jobs:
           script: |
             const bakeJson = JSON.parse(process.env.BAKE_JSON);
             const platformSlugMap = JSON.parse(process.env.PLATFORM_SLUG_MAP);
-            const images = process.env.IMAGES.trim().replace(/\s+/g,',').split(',');
+            const images = process.env.IMAGES.trim().replace(/[\s,]+/g,',').split(',');
             const imagesCrlf = images.join('\n');
             const targets = JSON.parse(process.env.BAKE_TARGETS);
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index de6c89276..8d1656fd7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -58,7 +58,9 @@ jobs:
         armv7-unknown-linux-gnueabi,
         aarch64-unknown-linux-gnu
       cloudflare_website: "flowzone"
-      bake_targets: default,multiarch
+      bake_targets: |
+        default,
+        multiarch
       jobs_timeout_minutes: 30
       docker_publish_platform_tags: true
       docker_runs_on: >
diff --git a/flowzone.yml b/flowzone.yml
index 75569e166..b88b0fc64 100644
--- a/flowzone.yml
+++ b/flowzone.yml
@@ -2141,7 +2141,7 @@ jobs:
             const { execSync } = require('child_process');
 
             const tempBakeFile = process.env.TEMP_BAKE_FILE;
-            const bakeTargets = process.env.BAKE_TARGETS.trim().replace(/\s+/g,',').split(',');
+            const bakeTargets = process.env.BAKE_TARGETS.trim().replace(/[\s,]+/g,',').split(',');
             const bakeFiles = JSON.parse(process.env.ALL_FILES)
               .filter(f => f.match(/docker-bake(\.override)?\.(json|hcl)/))
               .map(f => path.join(process.env.WORKDIR.trim(), f));
@@ -2336,7 +2336,7 @@ jobs:
           script: |
             const bakeJson = JSON.parse(process.env.BAKE_JSON);
             const platformSlugMap = JSON.parse(process.env.PLATFORM_SLUG_MAP);
-            const images = process.env.IMAGES.trim().replace(/\s+/g,',').split(',');
+            const images = process.env.IMAGES.trim().replace(/[\s,]+/g,',').split(',');
             const imagesCrlf = images.join('\n');
             const targets = JSON.parse(process.env.BAKE_TARGETS);