diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 23610b0..88e9da4 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.5
+version: 2.1.6
 appVersion: 2.1.1
diff --git a/voltha/templates/api-server.yaml b/voltha/templates/api-server.yaml
index 601ac28..c14c881 100644
--- a/voltha/templates/api-server.yaml
+++ b/voltha/templates/api-server.yaml
@@ -94,6 +94,8 @@
           value: {{ .Values.services.kafka.cluster.service }}
         - name: KAFKA_PORT
           value: {{ quote .Values.services.kafka.cluster.port }}
+        - name: KAFKA_TOPIC
+          value: {{ quote .Values.api_server.kafka_topic }}
         image: {{ tpl .Values.images.afrouterd.registry . }}{{ tpl .Values.images.afrouterd.repository . }}:{{ tpl ( tpl .Values.images.afrouterd.tag . ) . }}
         imagePullPolicy: {{ tpl .Values.images.afrouterd.pullPolicy . }}
         command: ["/app/arouterd"]
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 32de22e..5afee32 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -83,6 +83,8 @@
   timeout_long_request: '{{ .Values.defaults.rw_core.timeout }}'
   timeout_request: '{{ .Values.defaults.rw_core.timeout }}'
 
+api_server:
+  kafka_topic: 'affinityRouter'
 
 # Define Docker images to be used
 images: