diff --git a/chart/templates/gitlab/secret-redis-bb.yaml b/chart/templates/gitlab/secret-redis-bb.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d6e2e7d53c905ab4b006754860fc50913477faea
--- /dev/null
+++ b/chart/templates/gitlab/secret-redis-bb.yaml
@@ -0,0 +1,10 @@
+{{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: gitlab-redis-secret-bb
+  namespace: gitlab
+type: Opaque
+data:
+  secret: {{ .Values.addons.gitlab.redis.password | b64enc }}
+{{- end }}
diff --git a/chart/templates/gitlab/secret-redis.yaml b/chart/templates/gitlab/secret-redis.yaml
deleted file mode 100644
index c483c25ea5a0ab0d8171b808cd0df0a4be8721d1..0000000000000000000000000000000000000000
--- a/chart/templates/gitlab/secret-redis.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
-{{- if ne .Values.addons.gitlab.redis.password "" }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gitlab-redis-secret
-  namespace: gitlab
-type: Opaque
-data:
-  secret: {{ .Values.addons.gitlab.redis.password | b64enc }}
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml
index 50dd0779cbbed144a25d94dcad2501c7c20570de..c50c78ad8ce5f9bc9ca19bf239c28075becd374e 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -320,6 +320,12 @@ global:
     {{- end }}
   {{- end }}
 
+{{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
+  redis:  
+    password:
+      secret: "gitlab-redis-secret-bb"
+{{- end }}
+
 {{- if ne .Values.addons.gitlab.objectStorage.iamProfile "" }}
 use_iam_profile: true
 {{- end }}
diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml
index ee7547fa1eb91e3f313cc1c57d2bae36e93eaced..a964569422da0f704933f917e330ac3b78bb67ba 100644
--- a/chart/templates/monitoring/values.yaml
+++ b/chart/templates/monitoring/values.yaml
@@ -139,6 +139,9 @@ grafana:
   {{- if $istioInjection }}
   podAnnotations:
     {{ include "istioAnnotation" . }}
+    {{- if $gitlabRedis }}
+    checksum/gitlabRedisPassword: {{ sha256sum .Values.addons.gitlab.redis.password }}
+    {{- end }}    
   {{- end }}
 
   {{- if or .Values.loki.enabled .Values.tempo.enabled $gitlabRedis $authserviceRedisEnabled .Values.addons.argocd.enabled }}