diff --git a/.github/workflows/indexer-reusable-build-and-run-docker-image.yml b/.github/workflows/indexer-reusable-build-and-run-docker-image.yml
index c70f7a094b9..958f631de10 100644
--- a/.github/workflows/indexer-reusable-build-and-run-docker-image.yml
+++ b/.github/workflows/indexer-reusable-build-and-run-docker-image.yml
@@ -27,7 +27,7 @@ jobs:
         ports: 
           - 6379:6379
       kafka:
-        image: blacktop/kafka:2.6
+        image: bitnami/kafka:3.5.1
         env:
           KAFKA_ADVERTISED_HOST_NAME: localhost
           KAFKA_CREATE_TOPICS: 
diff --git a/.github/workflows/indexer-reusable-build-and-run-with-pg-redis-kafka.yml b/.github/workflows/indexer-reusable-build-and-run-with-pg-redis-kafka.yml
index 44166927609..454def73f54 100644
--- a/.github/workflows/indexer-reusable-build-and-run-with-pg-redis-kafka.yml
+++ b/.github/workflows/indexer-reusable-build-and-run-with-pg-redis-kafka.yml
@@ -26,7 +26,7 @@ jobs:
         ports: 
           - 6379:6379
       kafka:
-        image: blacktop/kafka:2.6
+        image: bitnami/kafka:3.5.1
         env:
           KAFKA_ADVERTISED_HOST_NAME: localhost
           KAFKA_CREATE_TOPICS: 
diff --git a/e2e-testing/docker-compose-e2e-test.yml b/e2e-testing/docker-compose-e2e-test.yml
index ffd959dcabc..0f79a8fd0c3 100644
--- a/e2e-testing/docker-compose-e2e-test.yml
+++ b/e2e-testing/docker-compose-e2e-test.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   kafka:
-    image: blacktop/kafka:2.6
+    image: bitnami/kafka:3.5.1
     ports:
       - 9092:9092
     environment:
diff --git a/indexer/docker-compose-local-deployment.yml b/indexer/docker-compose-local-deployment.yml
index 075ee7a4d5c..fb97ffae23f 100644
--- a/indexer/docker-compose-local-deployment.yml
+++ b/indexer/docker-compose-local-deployment.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   kafka:
-    image: blacktop/kafka:2.6
+    image: bitnami/kafka:3.5.1
     ports:
       - 9092:9092
     environment:
diff --git a/indexer/docker-compose.yml b/indexer/docker-compose.yml
index 306469544bc..1011447c4d5 100644
--- a/indexer/docker-compose.yml
+++ b/indexer/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   kafka:
-    image: blacktop/kafka:2.6
+    image: bitnami/kafka:3.5.1
     ports:
       - 9092:9092
     environment:
diff --git a/protocol/indexer/msgsender/msgsender_kafka_integration_test.go b/protocol/indexer/msgsender/msgsender_kafka_integration_test.go
index 85ab9476025..bd835f8d1fa 100644
--- a/protocol/indexer/msgsender/msgsender_kafka_integration_test.go
+++ b/protocol/indexer/msgsender/msgsender_kafka_integration_test.go
@@ -44,8 +44,8 @@ func TestMain(m *testing.M) {
 	}
 
 	resource, err := pool.RunWithOptions(&dockertest.RunOptions{
-		Repository: "blacktop/kafka",
-		Tag:        "2.6",
+		Repository: "bitnami/kafka",
+		Tag:        "3.5.1",
 		Env: []string{
 			"KAFKA_ADVERTISED_HOST_NAME=localhost",
 			fmt.Sprintf("KAFKA_CREATE_TOPICS=%s:1:1,%s:1:1", ON_CHAIN_KAFKA_TOPIC, OFF_CHAIN_KAFKA_TOPIC),