diff --git a/argocd/kafka/test/overwrite_values.yaml b/argocd/kafka/test/overwrite_values.yaml
index eec7f10..edfacac 100644
--- a/argocd/kafka/test/overwrite_values.yaml
+++ b/argocd/kafka/test/overwrite_values.yaml
@@ -1,2 +1,18 @@
 image:
-  tag: 7.5.1
\ No newline at end of file
+  tag: 7.5.1
+
+environment:
+  - name: KAFKA_BROKER_ID
+    value: "1"
+  - name: KAFKA_ZOOKEEPER_CONNECT
+    value: "{{ .Values.application.zookeeper.host }}:{{ .Values.application.zookeeper.port }}"
+  - name: KAFKA_LISTENERS
+    value: "PLAINTEXT://0.0.0.0:{{ .Values.application.port }}"
+  - name: KAFKA_ADVERTISED_LISTENERS
+    value: "PLAINTEXT://kafka.kafka:{{ .Values.application.port }}"
+  - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
+    value: PLAINTEXT:PLAINTEXT
+  - name: KAFKA_INTER_BROKER_LISTENER_NAME
+    value: PLAINTEXT
+  - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
+    value: "1"
\ No newline at end of file
diff --git a/argocd/kafka/test/values.yaml b/argocd/kafka/test/values.yaml
index 9be2cb6..e977e21 100644
--- a/argocd/kafka/test/values.yaml
+++ b/argocd/kafka/test/values.yaml
@@ -58,7 +58,7 @@ environment:
   - name: KAFKA_LISTENERS
     value: "PLAINTEXT://0.0.0.0:{{ .Values.application.port }}"
   - name: KAFKA_ADVERTISED_LISTENERS
-    value: "PLAINTEXT://kafka:{{ .Values.application.port }}"
+    value: "PLAINTEXT://kafka.kafka:{{ .Values.application.port }}"
   - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
     value: PLAINTEXT:PLAINTEXT
   - name: KAFKA_INTER_BROKER_LISTENER_NAME
@@ -136,14 +136,3 @@ affinity: {}
 podSpec: {}
 # containerSpec: will be added at the bottom of the container specification in the pod template
 containerSpec: {}
-argocd:
-  enabled: false
-  project: default
-  repoURL: https://github.com/exampleUser/exampleRepo
-  targetRevision: HEAD
-  # pathInRepo: is required if it is a git repo
-  pathInRepo: /
-  # chartName: required if repo is a Helm chart repo
-  chartName: ""
-  # targetCluster: specifies the cluster to deploy to
-  targetCluster: https://kubernetes.default.svc
diff --git a/helm/kafka/values.yaml b/helm/kafka/values.yaml
index 9159fea..131fa28 100644
--- a/helm/kafka/values.yaml
+++ b/helm/kafka/values.yaml
@@ -136,14 +136,3 @@ affinity: {}
 podSpec: {}
 # containerSpec: will be added at the bottom of the container specification in the pod template
 containerSpec: {}
-argocd:
-  enabled: false
-  project: default
-  repoURL: https://github.com/exampleUser/exampleRepo
-  targetRevision: HEAD
-  # pathInRepo: is required if it is a git repo
-  pathInRepo: /
-  # chartName: required if repo is a Helm chart repo
-  chartName: ""
-  # targetCluster: specifies the cluster to deploy to
-  targetCluster: https://kubernetes.default.svc