diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index efd38698e..6880f7c08 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -962,7 +962,7 @@ jobs:
 
           matrix="$(jq -cr --argjson in "$BAKE_JSON" --argjson slugs "$PLATFORM_SLUG_MAP" '.include |=
             map(.target as $t |
-            .platform_slugs = if ($in.target | has($t)) then ($in.target[$t].platforms | map($slugs[.]) | join(" ")) 
+            .platform_slugs = if ($in.target | has($t)) then ($in.target[$t].platforms | map($slugs[.]) | join(" "))
             else error("Unsupported target: \($t)") end)' <<< "${matrix}")"
 
           echo "build=${matrix}">> "${GITHUB_OUTPUT}"
@@ -3861,7 +3861,7 @@ jobs:
           ignore_lint="$(echo "${stack}" | jq -rc .ignore_lint)"
 
           if git diff --name-only "$(git rev-parse --abbrev-ref origin/HEAD)" \
-            | grep -Eq "^${template_file}$"; then
+            | grep -Eq "^${template_file}$|^.github/workflows/"; then
               echo "${SECRETS_CONTEXT}" | to_envs > .env
               echo "${VARS_CONTEXT}" | to_envs >> .env
               source .env && rm -f .env
diff --git a/flowzone.yml b/flowzone.yml
index db5de7b94..5fc7a86fd 100644
--- a/flowzone.yml
+++ b/flowzone.yml
@@ -1530,7 +1530,7 @@ jobs:
 
           matrix="$(jq -cr --argjson in "$BAKE_JSON" --argjson slugs "$PLATFORM_SLUG_MAP" '.include |=
             map(.target as $t |
-            .platform_slugs = if ($in.target | has($t)) then ($in.target[$t].platforms | map($slugs[.]) | join(" ")) 
+            .platform_slugs = if ($in.target | has($t)) then ($in.target[$t].platforms | map($slugs[.]) | join(" "))
             else error("Unsupported target: \($t)") end)' <<< "${matrix}")"
 
           echo "build=${matrix}">> "${GITHUB_OUTPUT}"
@@ -3392,7 +3392,7 @@ jobs:
           ignore_lint="$(echo "${stack}" | jq -rc .ignore_lint)"
 
           if git diff --name-only "$(git rev-parse --abbrev-ref origin/HEAD)" \
-            | grep -Eq "^${template_file}$"; then
+            | grep -Eq "^${template_file}$|^.github/workflows/"; then
               echo "${SECRETS_CONTEXT}" | to_envs > .env
               echo "${VARS_CONTEXT}" | to_envs >> .env
               source .env && rm -f .env