diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 5860084..11c001b 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.0.6
+version: 2.0.7
 appVersion: 2.0.0
diff --git a/voltha/templates/rw-core.yaml b/voltha/templates/rw-core.yaml
index 7945d57..1e43147 100644
--- a/voltha/templates/rw-core.yaml
+++ b/voltha/templates/rw-core.yaml
@@ -23,7 +23,7 @@
 {{- $request_timeout := tpl $root.Values.rw_core.timeout_request . }}
 {{- range $i, $e := until $count }}
 {{- $core_idx := add $i 1 }}
-{{- $affinity_group := add1 (mod $i 2) }}
+{{- $affinity_group := add1 (div $i 2) }}
 ---
 apiVersion: apps/v1
 kind: Deployment