diff --git a/base/mongodb/mongodb-values.yaml b/base/mongodb/mongodb-values.yaml
index 6dad351..b099a52 100644
--- a/base/mongodb/mongodb-values.yaml
+++ b/base/mongodb/mongodb-values.yaml
@@ -119,8 +119,8 @@ diagnosticMode:
 ##
 image:
   registry: docker.io
-  repository: bitnami/mongodb
-  tag: 7.0.5-debian-12-r5
+  repository: bitnamilegacy/mongodb
+  tag: 8.0.13-debian-12-r0
   digest: ""
   ## Specify a imagePullPolicy
   ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
diff --git a/base/rabbitmq/rabbitmq-values.yaml b/base/rabbitmq/rabbitmq-values.yaml
index 0291033..459e82b 100644
--- a/base/rabbitmq/rabbitmq-values.yaml
+++ b/base/rabbitmq/rabbitmq-values.yaml
@@ -32,7 +32,7 @@ global:
 ##
 image:
   registry: docker.io
-  repository: bitnami/rabbitmq
+  repository: bitnamilegacy/rabbitmq
   tag: 3.12.13-debian-12-r2
   digest: ""
   ## set to true if you would like to see extra information on logs