diff --git a/devops/linux/docker/conf/stack/docker-stack-high-0.yml b/devops/linux/docker/conf/stack/docker-stack-high-0.yml
index 50ff7ba35..fcfddbbb9 100644
--- a/devops/linux/docker/conf/stack/docker-stack-high-0.yml
+++ b/devops/linux/docker/conf/stack/docker-stack-high-0.yml
@@ -116,7 +116,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_01_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
@@ -156,7 +156,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_02_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
@@ -196,7 +196,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_03_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
diff --git a/devops/linux/docker/conf/stack/docker-stack-high-1.yml b/devops/linux/docker/conf/stack/docker-stack-high-1.yml
index c9568b1c3..2b6d1dfb9 100644
--- a/devops/linux/docker/conf/stack/docker-stack-high-1.yml
+++ b/devops/linux/docker/conf/stack/docker-stack-high-1.yml
@@ -116,7 +116,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_01_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
@@ -156,7 +156,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_02_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
@@ -196,7 +196,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_03_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
diff --git a/devops/linux/docker/conf/stack/docker-stack-low-0.yml b/devops/linux/docker/conf/stack/docker-stack-low-0.yml
index e4db8c78a..85c3a7792 100644
--- a/devops/linux/docker/conf/stack/docker-stack-low-0.yml
+++ b/devops/linux/docker/conf/stack/docker-stack-low-0.yml
@@ -117,7 +117,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_01_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
diff --git a/devops/linux/docker/conf/stack/docker-stack-low-1.yml b/devops/linux/docker/conf/stack/docker-stack-low-1.yml
index d31898ae7..9c091f133 100644
--- a/devops/linux/docker/conf/stack/docker-stack-low-1.yml
+++ b/devops/linux/docker/conf/stack/docker-stack-low-1.yml
@@ -117,7 +117,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_01_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
diff --git a/devops/windows/base-docker-linux/conf/images/conf-hub-images.sh b/devops/windows/base-docker-linux/conf/images/conf-hub-images.sh
index 1f30a3bb2..82f2878ef 100644
--- a/devops/windows/base-docker-linux/conf/images/conf-hub-images.sh
+++ b/devops/windows/base-docker-linux/conf/images/conf-hub-images.sh
@@ -6,8 +6,8 @@ export REGISTRY_IMAGE=registry:2
 # https://hub.docker.com/r/bitnami/keycloak/tags
 export KEYCLOAK_IMAGE=bitnami/keycloak:21.1.2
 
-# https://registry.hub.docker.com/r/bitnami/kafka/tags
-export KAFKA_IMAGE=bitnami/kafka:3.5
+# https://registry.hub.docker.com/r/soldevelo/kafka/tags
+export KAFKA_IMAGE=soldevelo/kafka:3.7
 
 # https://registry.hub.docker.com/r/dgraph/dgraph/tags
 export DGRAPH_IMAGE=dgraph/dgraph:v23.1.0
diff --git a/devops/windows/base-docker-linux/conf/stack/docker-stack-low.yml b/devops/windows/base-docker-linux/conf/stack/docker-stack-low.yml
index 266eb9fde..9c8c30a98 100644
--- a/devops/windows/base-docker-linux/conf/stack/docker-stack-low.yml
+++ b/devops/windows/base-docker-linux/conf/stack/docker-stack-low.yml
@@ -160,7 +160,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_01_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated
diff --git a/devops/windows/base-docker-wsl/conf/images/conf-hub-images.sh b/devops/windows/base-docker-wsl/conf/images/conf-hub-images.sh
index fd552ac9a..ceb4e9e2c 100644
--- a/devops/windows/base-docker-wsl/conf/images/conf-hub-images.sh
+++ b/devops/windows/base-docker-wsl/conf/images/conf-hub-images.sh
@@ -6,8 +6,8 @@ export REGISTRY_IMAGE=registry:2
 # https://hub.docker.com/r/bitnami/keycloak/tags
 export KEYCLOAK_IMAGE=bitnami/keycloak:21.1.2
 
-# https://registry.hub.docker.com/r/bitnami/kafka/tags
-export KAFKA_IMAGE=bitnami/kafka:3.5
+# https://registry.hub.docker.com/r/soldevelo/kafka/tags
+export KAFKA_IMAGE=soldevelo/kafka:3.7
 
 # https://registry.hub.docker.com/r/dgraph/dgraph/tags
 export DGRAPH_IMAGE=dgraph/dgraph:v23.1.0
diff --git a/devops/windows/base-docker-wsl/conf/stack/docker-stack-low.yml b/devops/windows/base-docker-wsl/conf/stack/docker-stack-low.yml
index 266eb9fde..9c8c30a98 100644
--- a/devops/windows/base-docker-wsl/conf/stack/docker-stack-low.yml
+++ b/devops/windows/base-docker-wsl/conf/stack/docker-stack-low.yml
@@ -160,7 +160,7 @@ services:
     volumes:
       - type: bind
         source: ${DATA_KAFKA_01_DIR}
-        target: /bitnami/kafka
+        target: /soldevelo/kafka
         read_only: false
     deploy:
       mode: replicated