diff --git a/values/rabbitmq/values/values-prod.yaml b/values/rabbitmq/values/values-prod.yaml
index 49f2d0ce..95005a85 100644
--- a/values/rabbitmq/values/values-prod.yaml
+++ b/values/rabbitmq/values/values-prod.yaml
@@ -1,5 +1,12 @@
 replicaCount: 3
 
+# NOTE(mrtz): Hack for working with bitnami legacy registry
+global:
+  security:
+    allowInsecureImages: true
+image:
+    repository: bitnamilegacy/rabbitmq
+
 auth:
   erlangCookie: prod-rabbitmq
   existingErlangSecret: prod-rabbitmq
diff --git a/values/redis/values-prod.yaml b/values/redis/values-prod.yaml
index bfb9a53d..3c1b6942 100644
--- a/values/redis/values-prod.yaml
+++ b/values/redis/values-prod.yaml
@@ -2,6 +2,13 @@
 #   repository: redis/redis-stack-server
 #   tag: 7.2.0-v10
 
+# NOTE(mrtz): Hack for working with bitnami legacy registry
+global:
+  security:
+    allowInsecureImages: true
+image:
+    repository: bitnamilegacy/redis
+
 architecture: replication
 
 replica:
@@ -34,4 +41,3 @@ master:
       cpu: 150m
       ephemeral-storage: 50Mi
       memory: 128Mi
-
diff --git a/values/redis/values-staging.yaml b/values/redis/values-staging.yaml
index 9041beab..195960f4 100644
--- a/values/redis/values-staging.yaml
+++ b/values/redis/values-staging.yaml
@@ -34,4 +34,3 @@ master:
       cpu: 150m
       ephemeral-storage: 50Mi
       memory: 128Mi
-