From c74be5bf7a1d4476313394284311ff991abb5f2f Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 1 Oct 2025 11:42:51 -0400
Subject: [PATCH 1/3] Update to use bitnamilegacy kafka

---
 finish/scripts/startContainers.bat | 2 +-
 finish/scripts/startContainers.sh  | 2 +-
 finish/scripts/startKafka.bat      | 2 +-
 finish/scripts/startKafka.sh       | 2 +-
 start/scripts/startContainers.bat  | 2 +-
 start/scripts/startContainers.sh   | 2 +-
 start/scripts/startKafka.bat       | 2 +-
 start/scripts/startKafka.sh        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/finish/scripts/startContainers.bat b/finish/scripts/startContainers.bat
index b9881f8c..d5941b8d 100644
--- a/finish/scripts/startContainers.bat
+++ b/finish/scripts/startContainers.bat
@@ -16,7 +16,7 @@ docker run -d ^
   --network=%NETWORK% ^
   --name=kafka ^
   --rm ^
-  bitnami/kafka:latest
+  bitnamilegacy/kafka:latest
 
 start /b docker run -d ^
   -e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^
diff --git a/finish/scripts/startContainers.sh b/finish/scripts/startContainers.sh
index 2d3e8f38..e3b27970 100755
--- a/finish/scripts/startContainers.sh
+++ b/finish/scripts/startContainers.sh
@@ -17,7 +17,7 @@ docker run -d \
   --network=$NETWORK \
   --name=kafka \
   --rm \
-  bitnami/kafka:latest
+  bitnamilegacy/kafka:latest
   
 sleep 15
 
diff --git a/finish/scripts/startKafka.bat b/finish/scripts/startKafka.bat
index bfb44d92..120ba406 100644
--- a/finish/scripts/startKafka.bat
+++ b/finish/scripts/startKafka.bat
@@ -17,4 +17,4 @@ docker run -d ^
     --network=%NETWORK% ^
     --name=kafka ^
     --rm ^
-    bitnami/kafka:latest
\ No newline at end of file
+    bitnamilegacy/kafka:latest
\ No newline at end of file
diff --git a/finish/scripts/startKafka.sh b/finish/scripts/startKafka.sh
index c1879b80..66d2d456 100755
--- a/finish/scripts/startKafka.sh
+++ b/finish/scripts/startKafka.sh
@@ -17,6 +17,6 @@ docker run -d \
     --network=$NETWORK \
     --name=kafka \
     --rm \
-    bitnami/kafka:latest &
+    bitnamilegacy/kafka:latest &
 
 wait
\ No newline at end of file
diff --git a/start/scripts/startContainers.bat b/start/scripts/startContainers.bat
index b9881f8c..d5941b8d 100644
--- a/start/scripts/startContainers.bat
+++ b/start/scripts/startContainers.bat
@@ -16,7 +16,7 @@ docker run -d ^
   --network=%NETWORK% ^
   --name=kafka ^
   --rm ^
-  bitnami/kafka:latest
+  bitnamilegacy/kafka:latest
 
 start /b docker run -d ^
   -e MP_MESSAGING_CONNECTOR_LIBERTY_KAFKA_BOOTSTRAP_SERVERS=%KAFKA_SERVER% ^
diff --git a/start/scripts/startContainers.sh b/start/scripts/startContainers.sh
index 2d3e8f38..e3b27970 100755
--- a/start/scripts/startContainers.sh
+++ b/start/scripts/startContainers.sh
@@ -17,7 +17,7 @@ docker run -d \
   --network=$NETWORK \
   --name=kafka \
   --rm \
-  bitnami/kafka:latest
+  bitnamilegacy/kafka:latest
   
 sleep 15
 
diff --git a/start/scripts/startKafka.bat b/start/scripts/startKafka.bat
index bfb44d92..120ba406 100644
--- a/start/scripts/startKafka.bat
+++ b/start/scripts/startKafka.bat
@@ -17,4 +17,4 @@ docker run -d ^
     --network=%NETWORK% ^
     --name=kafka ^
     --rm ^
-    bitnami/kafka:latest
\ No newline at end of file
+    bitnamilegacy/kafka:latest
\ No newline at end of file
diff --git a/start/scripts/startKafka.sh b/start/scripts/startKafka.sh
index c1879b80..66d2d456 100755
--- a/start/scripts/startKafka.sh
+++ b/start/scripts/startKafka.sh
@@ -17,6 +17,6 @@ docker run -d \
     --network=$NETWORK \
     --name=kafka \
     --rm \
-    bitnami/kafka:latest &
+    bitnamilegacy/kafka:latest &
 
 wait
\ No newline at end of file

From 973eceb300ec23cf6a20354796a9aa3c2d932f01 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 1 Oct 2025 13:03:33 -0400
Subject: [PATCH 2/3] Update to use bitnamilegacy kafka

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 97020fed..194c3c54 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,5 +58,5 @@ jobs:
       if: always()
       run: |
         sudo docker images
-        echo bitnami/kafka:latest version:
-        sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" bitnami/kafka:latest
+        echo bitnamilegacy/kafka:latest version:
+        sudo docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.version\"}}" bitnamilegacy/kafka:latest

From 491559723ff98b407a6e718962de6976d6849327 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 1 Oct 2025 13:23:00 -0400
Subject: [PATCH 3/3] Update to use bitnamilegacy kafka

---
 scripts/testApp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/testApp.sh b/scripts/testApp.sh
index 555f42c5..b6b3f391 100755
--- a/scripts/testApp.sh
+++ b/scripts/testApp.sh
@@ -19,7 +19,7 @@ set -euxo pipefail
 
 ./scripts/buildImages.sh
 
-docker pull -q "bitnami/kafka:latest"
+docker pull -q "bitnamilegacy/kafka:latest"
 
 ./scripts/startContainers.sh