diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 8ed2821..629d817 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha OpenOLT Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.1
-appVersion: 2.1.1
+version: 2.1.2
+appVersion: 2.1.2
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index dade7e4..a97bd27 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha OpenONU Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.1
-appVersion: 2.1.0
+version: 2.1.2
+appVersion: 2.1.1
diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index d6d20ee..41cd3c2 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -17,5 +17,8 @@
 description: A Helm chart for Voltha Simulated Adaptyer based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.2
-appVersion: 2.1.1
+version: 2.1.3
+
+# appVersion is 2 because this chart contains multiple 2.x images that may have
+# different individual image versions.
+appVersion: 2
diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index 8882f59..3901a11 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/values.yaml
@@ -16,7 +16,6 @@
 # Default overrides
 defaults:
   image_registry: ""
-  image_tag: '{{ .Chart.AppVersion }}'
   image_org: "voltha/"
   image_pullPolicy: "Always"
 
@@ -46,11 +45,11 @@
   adapter_simulated_olt:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-adapter-simulated-olt'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.2.0'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   adapter_simulated_onu:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-adapter-simulated-onu'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.2.0'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 5b0c731..7dc328a 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,8 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.8
-appVersion: 2.1.1
+version: 2.1.9
+
+# appVersion is 2 because this chart contains multiple 2.x images that may have
+# different individual image versions.
+appVersion: 2
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 5afee32..07760d3 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -21,7 +21,6 @@
 defaults:
   log_level: "ERROR"
   image_registry: ''
-  image_tag: '{{ .Chart.AppVersion }}'
   image_org: "voltha/"
   image_pullPolicy: "Always"
   rw_core:
@@ -91,36 +90,36 @@
   cli:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-cli'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.1.3'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   ofagent:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ofagent'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.1.3'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   ro_core:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ro-core'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.1.3'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   rw_core:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.1.3'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   afrouter:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-afrouter'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.2.0'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   afrouterd:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-afrouterd'
-    tag: '{{ .Values.defaults.image_tag }}'
+    tag: '2.2.0'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
     restartPolicy: 'Always'