diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 257231f4..74e42c2d 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -24,6 +24,7 @@ jobs:
               echo "E2E test pod completed successfully."
               kubectl logs $TEST_POD
               kubectl get pods
+              kubectl get svc
               exit 0
             elif [ "$STATUS" = "Error" ]; then
               echo "E2E test pod failed."
diff --git a/deploy/kind/e2e/e2e-batch.yaml b/deploy/kind/e2e/e2e-batch.yaml
index 4bc41cff..d568b6e2 100644
--- a/deploy/kind/e2e/e2e-batch.yaml
+++ b/deploy/kind/e2e/e2e-batch.yaml
@@ -29,6 +29,6 @@ spec:
             - name: INV_HTTP_URL
               value: "kessel-inventory-service:8081"
             - name: KAFKA_BOOTSTRAP_SERVERS
-              value: "localhost:9092"
+              value: "my-cluster-kafka-bootstrap.default.svc.cluster.local:9092"
           command: ["/usr/local/bin/e2e-inventory-tests", "-test.v"]
       restartPolicy: Never
diff --git a/deploy/kind/inventory/strimzi.yaml b/deploy/kind/inventory/strimzi.yaml
index e3de6219..651a8ddc 100644
--- a/deploy/kind/inventory/strimzi.yaml
+++ b/deploy/kind/inventory/strimzi.yaml
@@ -1,8 +1,8 @@
-# Taken from: https://github.com/strimzi/strimzi-kafka-operator/blob/main/examples/kafka/kafka-ephemeral.yaml
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
 metadata:
   name: my-cluster
+  namespace: default
 spec:
   kafka:
     version: 3.8.0
@@ -12,24 +12,17 @@ spec:
         port: 9092
         type: internal
         tls: false
-      - name: tls
-        port: 9093
-        type: internal
-        tls: true
     config:
-      offsets.topic.replication.factor: 3
-      transaction.state.log.replication.factor: 3
-      transaction.state.log.min.isr: 2
-      default.replication.factor: 3
-      min.insync.replicas: 2
-      inter.broker.protocol.version: "3.8"
+      zookeeper.connect: my-cluster-zookeeper-client:2181
+      offsets.topic.replication.factor: 1
+      transaction.state.log.replication.factor: 1
+      transaction.state.log.min.isr: 1
+      default.replication.factor: 1
+      min.insync.replicas: 1
+      advertised.listeners: PLAINTEXT://my-cluster-kafka-bootstrap.default.svc.cluster.local:9092
     storage:
       type: ephemeral
   zookeeper:
     replicas: 1
     storage:
       type: ephemeral
-  entityOperator:
-    topicOperator: {}
-    userOperator: {}
-
diff --git a/deploy/kind/relations/spicedb-kind-setup/postgres/postgresql.yaml b/deploy/kind/relations/spicedb-kind-setup/postgres/postgresql.yaml
index 96d60bdf..d037939c 100644
--- a/deploy/kind/relations/spicedb-kind-setup/postgres/postgresql.yaml
+++ b/deploy/kind/relations/spicedb-kind-setup/postgres/postgresql.yaml
@@ -51,4 +51,5 @@ spec:
       volumes:
       - name: postgres-storage
         persistentVolumeClaim:
-          claimName: postgres-pvc
\ No newline at end of file
+          claimName: postgres-pvc
+
diff --git a/deploy/kind/relations/spicedb-kind-setup/postgres/storage.yaml b/deploy/kind/relations/spicedb-kind-setup/postgres/storage.yaml
index 5e9954aa..0c7faa18 100644
--- a/deploy/kind/relations/spicedb-kind-setup/postgres/storage.yaml
+++ b/deploy/kind/relations/spicedb-kind-setup/postgres/storage.yaml
@@ -27,4 +27,5 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: 1Gi
\ No newline at end of file
+      storage: 1Gi
+
diff --git a/deploy/kind/relations/spicedb-kind-setup/relations-api/svc.yaml b/deploy/kind/relations/spicedb-kind-setup/relations-api/svc.yaml
index 1f8d3d73..36cc6d35 100644
--- a/deploy/kind/relations/spicedb-kind-setup/relations-api/svc.yaml
+++ b/deploy/kind/relations/spicedb-kind-setup/relations-api/svc.yaml
@@ -28,4 +28,5 @@ spec:
                 port:
                   number: 9000
             path: /
-            pathType: Prefix
\ No newline at end of file
+            pathType: Prefix
+
diff --git a/deploy/kind/relations/spicedb-kind-setup/sm-spicedb.yaml b/deploy/kind/relations/spicedb-kind-setup/sm-spicedb.yaml
index b39d61b0..f6063f91 100644
--- a/deploy/kind/relations/spicedb-kind-setup/sm-spicedb.yaml
+++ b/deploy/kind/relations/spicedb-kind-setup/sm-spicedb.yaml
@@ -19,13 +19,3 @@ spec:
   - port: metrics
     path: /metrics
     interval: 15s
-
-
-
-
-
-
-
-
-
-
diff --git a/deploy/kind/relations/spicedb-kind-setup/spicedb-cr.yaml b/deploy/kind/relations/spicedb-kind-setup/spicedb-cr.yaml
index 5cbbde36..284b13a7 100644
--- a/deploy/kind/relations/spicedb-kind-setup/spicedb-cr.yaml
+++ b/deploy/kind/relations/spicedb-kind-setup/spicedb-cr.yaml
@@ -30,4 +30,5 @@ stringData:
 #     -----BEGIN CERTIFICATE-----
 #    --- example aws rds ca cert
 #     -----END CERTIFICATE-----
-# ---
\ No newline at end of file
+# ---
+
diff --git a/scripts/start-inventory-kind.sh b/scripts/start-inventory-kind.sh
index c69023d4..7aefa554 100755
--- a/scripts/start-inventory-kind.sh
+++ b/scripts/start-inventory-kind.sh
@@ -60,5 +60,5 @@ while true; do
 done
 
 kubectl apply -f deploy/kind/e2e/e2e-batch.yaml
-
+sleep 30 ##wait for kafka pod to run
 echo "Setup complete."
\ No newline at end of file