diff --git a/VERSION b/VERSION
index fc33f09..e4604e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.1-dev1
+3.2.1
diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index 2498fd3..d30a723 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -29,7 +29,7 @@
 name: voltha-infra
 
 appVersion: "2.10"
-version: 2.10.8
+version: 2.10.9
 
 dependencies:
   - name: onos-classic
@@ -46,11 +46,11 @@
     condition: bbsim-sadis-server.enabled
   - name: etcd
     repository: https://charts.bitnami.com/bitnami
-    version: 6.13.9
+    version: 8.5.11
     condition: etcd.enabled
   - name: kafka
     repository: https://charts.bitnami.com/bitnami
-    version: 14.9.0
+    version: 20.0.2
     condition: kafka.enabled
   - name: freeradius
     repository: https://charts.opencord.org
diff --git a/voltha-infra/values.yaml b/voltha-infra/values.yaml
index aabca71..c3be649 100644
--- a/voltha-infra/values.yaml
+++ b/voltha-infra/values.yaml
@@ -176,8 +176,6 @@
     enabled: false
   statefulset:
     replicaCount: 1
-  service:
-    port: 2379
   autoCompactionMode: "revision"
   autoCompactionRetention: 1
   extraEnvVars:
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 312ded4..55f322c 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.11.3"
+version: "2.11.4"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"