diff --git a/helm-charts/templates/log-conf.yaml b/helm-charts/templates/log-conf.yaml
index 753d772e..61387103 100644
--- a/helm-charts/templates/log-conf.yaml
+++ b/helm-charts/templates/log-conf.yaml
@@ -6,19 +6,19 @@ metadata:
 data:
   config.toml: |
     [controlPlane]
-      enabled = true
-      serviceURL = "https://am-service.apim-deployment.svc.cluster.local:9443/"
-      username = "admin"
-      password = "admin"
-      environmentLabels = ["Default"]
-      skipSSLVerification = true
+      enabled = {{ .Values.controlPlane.enabled }}
+      serviceURL = "{{ .Values.controlPlane.serviceURL }}"
+      username = "{{ .Values.controlPlane.username }}"
+      password = "{{ .Values.controlPlane.password }}"
+      environmentLabels = ["{{ .Values.controlPlane.environmentLabels }}"]
+      skipSSLVerification = {{ .Values.controlPlane.skipSSLVerification }}
       [controlPlane.brokerConnectionParameters]
-      eventListeningEndpoints = ["amqp://admin:admin@am-service.apim-deployment.svc.cluster.local:5672?retries='10'&connectdelay='30'"]
+      eventListeningEndpoints = ["{{ .Values.controlPlane.eventListeningEndpoints }}"]
     
     [dataPlane]
-      enabled = true
-      k8ResourceEndpoint = "https://apk-test-setup-wso2-apk-config-ds-service.apk-integration-test.svc.cluster.local:9443/api/configurator/apis/generate-k8s-resources"
-      namespace = "apk-integration-test"
+      enabled = {{ .Values.dataPlane.enabled }}
+      k8ResourceEndpoint = "{{ .Values.dataPlane.k8ResourceEndpoint }}"
+      namespace = "{{ .Values.dataPlane.namespace }}"
   log_config.toml: |
     # The logging configuration for Adapter
 
diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml
index 3a77ac4b..55c7eb43 100644
--- a/helm-charts/values.yaml
+++ b/helm-charts/values.yaml
@@ -15,12 +15,22 @@
 # under the License.
 
 replicaCount: 1
-
 image:
   repository: apim-apk-agent
   tag: 1.0.0-SNAPSHOT
   pullPolicy: IfNotPresent
 service:
   name: apim-apk-agent-service
-
 resources: {}
+controlPlane:
+  enabled: true
+  serviceURL: https://am-service.apim-deployment.svc.cluster.local:9443/
+  username: admin
+  password: admin
+  environmentLabels: Default
+  skipSSLVerification: true
+  eventListeningEndpoints: amqp://admin:admin@am-service:apim-deployment:svc:cluster:local:5672?retries='10'&connectdelay='30'
+dataPlane:
+  enabled: true
+  k8ResourceEndpoint: https://apk-test-setup-wso2-apk-config-ds-service.apk-integration-test.svc.cluster.local:9443/api/configurator/apis/generate-k8s-resources
+  namespace: apk-integration-test