diff --git a/helm/openwhisk/templates/controller-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml
index 211e1ba7..d6840120 100644
--- a/helm/openwhisk/templates/controller-pod.yaml
+++ b/helm/openwhisk/templates/controller-pod.yaml
@@ -174,7 +174,7 @@ spec:
         - name: "METRICS_KAMON"
           value: "true"
 {{ end }}
-{{ if or .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }}
+{{ if .Values.metrics.kamonTags }}
         - name: "METRICS_KAMON_TAGS"
           value: "true"
 {{ end }}
diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index 6747ff0b..7da14a32 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -179,7 +179,7 @@ spec:
           - name: "METRICS_KAMON"
             value: "true"
 {{ end }}
-{{ if and .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }}
+{{ if .Values.metrics.kamonTags }}
           - name: "METRICS_KAMON_TAGS"
             value: "true"
 {{ end }}