diff --git a/changelog.d/5-internal/bitnami-oci b/changelog.d/5-internal/bitnami-oci
new file mode 100644
index 00000000000..22201f3c1bd
--- /dev/null
+++ b/changelog.d/5-internal/bitnami-oci
@@ -0,0 +1 @@
+charts/{redis-cluster,rabbitmq}: Use oci helm repository for upstream helm charts (#4405, ##)
\ No newline at end of file
diff --git a/charts/rabbitmq/requirements.yaml b/charts/rabbitmq/requirements.yaml
index bde52b88f70..520ba106257 100644
--- a/charts/rabbitmq/requirements.yaml
+++ b/charts/rabbitmq/requirements.yaml
@@ -1,6 +1,4 @@
 dependencies:
 - name: rabbitmq
   version: 14.6.9
-  # Use helm repo from the git repo because bitnami's repo is failing
-  # intermittently
-  repository: https://raw.githubusercontent.com/bitnami/charts/234a73987975ffeb0674dc60287012052ce0ddfc/bitnami
+  repository: oci://registry-1.docker.io/bitnamicharts
diff --git a/charts/redis-cluster/requirements.yaml b/charts/redis-cluster/requirements.yaml
index e6acd52426b..54334b5bb8b 100644
--- a/charts/redis-cluster/requirements.yaml
+++ b/charts/redis-cluster/requirements.yaml
@@ -1,6 +1,4 @@
 dependencies:
 - name: redis-cluster
   version: 7.6.4
-  # Use helm repo from the git repo because bitnami's repo is failing
-  # intermittently
-  repository: https://raw.githubusercontent.com/bitnami/charts/234a73987975ffeb0674dc60287012052ce0ddfc/bitnami
+  repository: oci://registry-1.docker.io/bitnamicharts