diff --git a/src/vibe_core/vibe_core/cli/constants.py b/src/vibe_core/vibe_core/cli/constants.py
index 09d9651a..080a1f83 100644
--- a/src/vibe_core/vibe_core/cli/constants.py
+++ b/src/vibe_core/vibe_core/cli/constants.py
@@ -14,5 +14,5 @@
 # Local constants
 ONNX_SUBDIR = "onnx_resources"
 FARMVIBES_AI_LOG_LEVEL = "DEBUG"
-REDIS_IMAGE_TAG = "7.0.4-debian-11-r11"
-RABBITMQ_IMAGE_TAG = "3.10.8-debian-11-r4"
+REDIS_IMAGE_TAG = "7.4.1-debian-12-r2"
+RABBITMQ_IMAGE_TAG = "4.0.4-debian-12-r1"
diff --git a/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/rabbitmq.tf b/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/rabbitmq.tf
index 0c1ecbe0..c76010fc 100644
--- a/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/rabbitmq.tf
+++ b/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/rabbitmq.tf
@@ -4,7 +4,7 @@
 resource "helm_release" "rabbitmq" {
   name = "rabbitmq"
 
-  repository = "https://charts.bitnami.com/bitnami"
+  repository = "oci://registry-1.docker.io/bitnamicharts"
   chart      = "rabbitmq"
   namespace  = var.namespace
 
diff --git a/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/redis.tf b/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/redis.tf
index d35ff912..936a0669 100644
--- a/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/redis.tf
+++ b/src/vibe_core/vibe_core/terraform/aks/modules/kubernetes/redis.tf
@@ -4,7 +4,7 @@
 resource "helm_release" "redis" {
   name = "redis"
 
-  repository = "https://charts.bitnami.com/bitnami"
+  repository = "oci://registry-1.docker.io/bitnamicharts"
   chart      = "redis"
   namespace  = var.namespace
 
diff --git a/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/rabbitmq.tf b/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/rabbitmq.tf
index 35cccd5d..7fd77839 100644
--- a/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/rabbitmq.tf
+++ b/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/rabbitmq.tf
@@ -4,7 +4,7 @@
 resource "helm_release" "rabbitmq" {
   name = "rabbitmq"
 
-  repository = "https://charts.bitnami.com/bitnami"
+  repository = "oci://registry-1.docker.io/bitnamicharts"
   chart      = "rabbitmq"
   namespace  = var.namespace
 
diff --git a/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/redis.tf b/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/redis.tf
index da2d11e3..812012cb 100644
--- a/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/redis.tf
+++ b/src/vibe_core/vibe_core/terraform/local/modules/kubernetes/redis.tf
@@ -4,7 +4,7 @@
 resource "helm_release" "redis" {
   name = "redis"
 
-  repository = "https://charts.bitnami.com/bitnami"
+  repository = "oci://registry-1.docker.io/bitnamicharts"
   chart      = "redis"
   namespace  = var.namespace