diff --git a/codebundles/gcp-bucket-health/.runwhen/templates/gcp-bucket-health-taskset.yaml b/codebundles/gcp-bucket-health/.runwhen/templates/gcp-bucket-health-taskset.yaml
index 5d00e2ed6..feaaa3731 100644
--- a/codebundles/gcp-bucket-health/.runwhen/templates/gcp-bucket-health-taskset.yaml
+++ b/codebundles/gcp-bucket-health/.runwhen/templates/gcp-bucket-health-taskset.yaml
@@ -31,5 +31,9 @@ spec:
     - name: PUBLIC_ACCESS_BUCKET_THRESHOLD
       value: "0"
   secretsProvided:
+  {% if wb_version %}
+    {% include "gcp-auth.yaml" ignore missing %}
+  {% else %}
     - name: gcp_credentials
-      workspaceKey: {{custom.gcp_ops_suite_sa}}
\ No newline at end of file
+      workspaceKey: AUTH DETAILS NOT FOUND
+  {% endif %}
\ No newline at end of file
diff --git a/codebundles/gcp-cloud-function-health/.runwhen/templates/gcp-cloud-function-health-taskset.yaml b/codebundles/gcp-cloud-function-health/.runwhen/templates/gcp-cloud-function-health-taskset.yaml
index dae26d4ab..99f88b317 100644
--- a/codebundles/gcp-cloud-function-health/.runwhen/templates/gcp-cloud-function-health-taskset.yaml
+++ b/codebundles/gcp-cloud-function-health/.runwhen/templates/gcp-cloud-function-health-taskset.yaml
@@ -27,5 +27,9 @@ spec:
     - name: GCP_PROJECT_ID
       value: {{match_resource.resource.project_id}}
   secretsProvided:
+  {% if wb_version %}
+    {% include "gcp-auth.yaml" ignore missing %}
+  {% else %}
     - name: gcp_credentials
-      workspaceKey: {{custom.gcp_ops_suite_sa}}
\ No newline at end of file
+      workspaceKey: AUTH DETAILS NOT FOUND
+  {% endif %}
\ No newline at end of file
diff --git a/codebundles/gke-cluster-health/.runwhen/templates/gke-cluster-health-taskset.yaml b/codebundles/gke-cluster-health/.runwhen/templates/gke-cluster-health-taskset.yaml
index 4ed03e50a..7ce1ef557 100755
--- a/codebundles/gke-cluster-health/.runwhen/templates/gke-cluster-health-taskset.yaml
+++ b/codebundles/gke-cluster-health/.runwhen/templates/gke-cluster-health-taskset.yaml
@@ -25,5 +25,9 @@ spec:
     - name: GCP_PROJECT_ID
       value: {{match_resource.resource.project_id}}
   secretsProvided:
+  {% if wb_version %}
+    {% include "gcp-auth.yaml" ignore missing %}
+  {% else %}
     - name: gcp_credentials
-      workspaceKey: {{custom.gcp_ops_suite_sa}}
\ No newline at end of file
+      workspaceKey: AUTH DETAILS NOT FOUND
+  {% endif %}
\ No newline at end of file
diff --git a/codebundles/k8s-ingress-gce-healthcheck/.runwhen/templates/k8s-ingress-gce-healthcheck-taskset.yaml b/codebundles/k8s-ingress-gce-healthcheck/.runwhen/templates/k8s-ingress-gce-healthcheck-taskset.yaml
index 0b3351da7..619408b22 100644
--- a/codebundles/k8s-ingress-gce-healthcheck/.runwhen/templates/k8s-ingress-gce-healthcheck-taskset.yaml
+++ b/codebundles/k8s-ingress-gce-healthcheck/.runwhen/templates/k8s-ingress-gce-healthcheck-taskset.yaml
@@ -34,9 +34,10 @@ spec:
   secretsProvided:
   {% if wb_version %}
     {% include "kubernetes-auth.yaml" ignore missing %}
+    {% include "gcp-auth.yaml" ignore missing %}
   {% else %}
     - name: kubeconfig
       workspaceKey: {{custom.kubeconfig_secret_name}}
-  {% endif %}
     - name: gcp_credentials
-      workspaceKey: {{custom.gcp_ops_suite_sa}}
\ No newline at end of file
+      workspaceKey: AUTH DETAILS NOT FOUND
+  {% endif %}
\ No newline at end of file