diff --git a/stable/spring-cloud-data-flow/Chart.yaml b/stable/spring-cloud-data-flow/Chart.yaml
index aab6dd0e25..086348a743 100644
--- a/stable/spring-cloud-data-flow/Chart.yaml
+++ b/stable/spring-cloud-data-flow/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Toolkit for building data processing pipelines.
 name: spring-cloud-data-flow
-version: 2.6.0
+version: 2.6.1
 appVersion: 2.4.0.RELEASE
 home: http://cloud.spring.io/spring-cloud-dataflow/
 sources:
diff --git a/stable/spring-cloud-data-flow/templates/prometheus-proxy-clusterrolebinding.yaml b/stable/spring-cloud-data-flow/templates/prometheus-proxy-clusterrolebinding.yaml
index 11cce0ac44..0fde72d1c0 100644
--- a/stable/spring-cloud-data-flow/templates/prometheus-proxy-clusterrolebinding.yaml
+++ b/stable/spring-cloud-data-flow/templates/prometheus-proxy-clusterrolebinding.yaml
@@ -8,7 +8,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}-prometheus-proxy
-    namespace: default
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: cluster-admin
diff --git a/stable/spring-cloud-data-flow/templates/prometheus-proxy-serviceaccount.yaml b/stable/spring-cloud-data-flow/templates/prometheus-proxy-serviceaccount.yaml
index 7cc52e33cf..d2140f351e 100644
--- a/stable/spring-cloud-data-flow/templates/prometheus-proxy-serviceaccount.yaml
+++ b/stable/spring-cloud-data-flow/templates/prometheus-proxy-serviceaccount.yaml
@@ -5,6 +5,6 @@ metadata:
   name: {{ .Release.Name }}-prometheus-proxy
   labels:
     app: {{ .Release.Name }}-prometheus-proxy
-  namespace: default
+  namespace: {{ .Release.Namespace }}
 {{- end }}