diff --git a/.github/workflows/go-cd.yml b/.github/workflows/go-cd.yml
index 517163eb95..d1897313d9 100644
--- a/.github/workflows/go-cd.yml
+++ b/.github/workflows/go-cd.yml
@@ -39,7 +39,7 @@ jobs:
                       | .RUNNER = (
                           if (.RUNNER | type == "array") 
                           then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end)) 
-                          else (if . == "ephemeral" then "persistent" else . end) 
+                          else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end) 
                           end
                       )
                   )' < .github/json_matrices/build-matrix.json | jq -c .)
diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
index 8e67197890..1941fb6880 100644
--- a/.github/workflows/java-cd.yml
+++ b/.github/workflows/java-cd.yml
@@ -41,7 +41,7 @@ jobs:
                       | .RUNNER = (
                           if (.RUNNER | type == "array") 
                           then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end)) 
-                          else (if . == "ephemeral" then "persistent" else . end) 
+                          else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end) 
                           end
                       )
                   )' < .github/json_matrices/build-matrix.json | jq -c .)
diff --git a/.github/workflows/npm-cd.yml b/.github/workflows/npm-cd.yml
index ea76aa0e8f..905ca52c77 100644
--- a/.github/workflows/npm-cd.yml
+++ b/.github/workflows/npm-cd.yml
@@ -65,7 +65,7 @@ jobs:
                       | .RUNNER = (
                           if (.RUNNER | type == "array") 
                           then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end)) 
-                          else (if . == "ephemeral" then "persistent" else . end) 
+                          else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end) 
                           end
                       )
                   )' < .github/json_matrices/build-matrix.json | jq -c .)
diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml
index e3a2f511d4..de4d884435 100644
--- a/.github/workflows/pypi-cd.yml
+++ b/.github/workflows/pypi-cd.yml
@@ -47,7 +47,7 @@ jobs:
                       | .RUNNER = (
                           if (.RUNNER | type == "array") 
                           then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end)) 
-                          else (if . == "ephemeral" then "persistent" else . end) 
+                          else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end) 
                           end
                       )
                   )' < .github/json_matrices/build-matrix.json | jq -c .)