diff --git a/.container-caps-backup-20260425-151947/HelixLLM/deploy/compose.yaml b/.container-caps-backup-20260425-151947/HelixLLM/deploy/compose.yaml
index beff84ec..a79caa98 100644
--- a/.container-caps-backup-20260425-151947/HelixLLM/deploy/compose.yaml
+++ b/.container-caps-backup-20260425-151947/HelixLLM/deploy/compose.yaml
@@ -121,7 +121,7 @@ services:
 
   # --- Messaging ---
   kafka:
-    image: bitnami/kafka:latest
+    image: soldevelo/kafka:latest
     ports:
       - "9092:9092"
     environment:
diff --git a/.container-caps-backup-20260425-151947/docker-compose.helixllm-infra.yml b/.container-caps-backup-20260425-151947/docker-compose.helixllm-infra.yml
index 41b06664..a889cc64 100644
--- a/.container-caps-backup-20260425-151947/docker-compose.helixllm-infra.yml
+++ b/.container-caps-backup-20260425-151947/docker-compose.helixllm-infra.yml
@@ -60,7 +60,7 @@ services:
 
   # HelixLLM Kafka for messaging
   helixllm-kafka:
-    image: bitnami/kafka:latest
+    image: soldevelo/kafka:latest
     container_name: helixagent-helixllm-kafka
     ports:
       - "${HELIX_LLM_KAFKA_PORT:-9093}:9092"
diff --git a/.container-caps-backup-20260425-151947/docker-compose.helixllm.yml b/.container-caps-backup-20260425-151947/docker-compose.helixllm.yml
index 506e6a56..2708f0fd 100644
--- a/.container-caps-backup-20260425-151947/docker-compose.helixllm.yml
+++ b/.container-caps-backup-20260425-151947/docker-compose.helixllm.yml
@@ -167,7 +167,7 @@ services:
 
   # HelixLLM Kafka for messaging
   helixllm-kafka:
-    image: docker.io/bitnami/kafka:3.9.0
+    image: docker.io/soldevelo/kafka:3.9.0
     container_name: helixagent-helixllm-kafka
     ports:
       - "${HELIX_LLM_KAFKA_PORT:-9093}:9092"
diff --git a/docker-compose.helixllm-infra.yml b/docker-compose.helixllm-infra.yml
index c0b6a2d4..f90579ab 100644
--- a/docker-compose.helixllm-infra.yml
+++ b/docker-compose.helixllm-infra.yml
@@ -72,7 +72,7 @@ services:
 
   # HelixLLM Kafka for messaging
   helixllm-kafka:
-    image: bitnami/kafka:latest
+    image: soldevelo/kafka:latest
     container_name: helixagent-helixllm-kafka
     mem_limit: 4g
     memswap_limit: 4g
diff --git a/docker-compose.helixllm.yml b/docker-compose.helixllm.yml
index 74f1b961..82450598 100644
--- a/docker-compose.helixllm.yml
+++ b/docker-compose.helixllm.yml
@@ -183,7 +183,7 @@ services:
 
   # HelixLLM Kafka for messaging
   helixllm-kafka:
-    image: docker.io/bitnami/kafka:3.9.0
+    image: docker.io/soldevelo/kafka:3.9.0
     container_name: helixagent-helixllm-kafka
     mem_limit: 4g
     memswap_limit: 4g