diff --git a/README.md b/README.md
index 7ac22ee..4bc3c81 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,8 @@
 
 ### Use the OpenONU python adapter
 
+Up to release `0.10.0` of the `voltha-stack` chart you can still use the openonu-py version of the adapter.
+
 > NOTE that this adapter is now unsupported, so you're in uncharted territory from now on.
 
 ```shell
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 12b5418..440e0a1 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-openonu"
-version: "2.7.12"
+version: "2.7.13"
 description: "A Helm chart for Voltha OpenONU Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index f3f1413..1ea2980 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-{{- if and (hasKey .Values "use_openonu_adapter_go") .Values.use_openonu_adapter_go }}
 {{- $log_level := tpl .Values.adapter_open_onu.log_level . | upper }}
 ---
 apiVersion: apps/v1
@@ -118,4 +117,3 @@
               port: 8080
             initialDelaySeconds: 10
             periodSeconds: 5
-{{- end }}
diff --git a/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml b/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml
deleted file mode 100644
index 3a96220..0000000
--- a/voltha-adapter-openonu/templates/openonu-py-statefulset.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-{{- if not (and (hasKey .Values "use_openonu_adapter_go") .Values.use_openonu_adapter_go) }}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: "{{ template "fullname" . }}"
-  namespace: {{ .Release.Namespace }}
-  {{- if or (hasKey .Values "extra_deployment_labels") (hasKey .Values "openonu_deployment_labels") }}
-  labels:
-    {{- if hasKey .Values "extra_deployment_labels" }}
-    {{- range $key, $val := .Values.extra_deployment_labels }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
-    {{- end }}
-    {{- if hasKey .Values "openonu_deployment_labels" }}
-    {{- range $key, $val := .Values.openonu_deployment_labels }}
-    {{ $key }}: {{ $val | quote }}
-    {{- end }}
-    {{- end }}
-  {{- end }}
-spec:
-  replicas: {{ .Values.replicas.adapter_open_onu }}
-  podManagementPolicy: Parallel
-  serviceName: "openonu"
-  selector:
-    matchLabels:
-      app: adapter-open-onu
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      namespace: {{ .Release.Namespace }}
-      labels:
-        app: adapter-open-onu
-        release: {{ .Release.Name }}
-        app.kubernetes.io/name: "adapter-open-onu"
-        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
-        app.kubernetes.io/component: "adapter"
-        app.kubernetes.io/part-of: "voltha"
-        app.kubernetes.io/stack: "{{ .Values.global.stack_name }}"
-        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        {{- if hasKey .Values "extra_pod_labels" }}
-        {{- range $key, $val := .Values.extra_pod_labels }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
-        {{- end }}
-        {{- if hasKey .Values "openonu_pod_labels" }}
-        {{- range $key, $val := .Values.openonu_pod_labels }}
-        {{ $key }}: {{ $val | quote }}
-        {{- end }}
-        {{- end }}
-    spec:
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        runAsUser: {{ .Values.securityContext.runAsUser }}
-        runAsGroup: {{ .Values.securityContext.runAsGroup }}
-        fsGroup: {{ .Values.securityContext.fsGroup }}
-      {{- end }}
-      containers:
-      - name: adapter-open-onu
-        image: '{{ tpl .Values.images.adapter_open_onu.registry . }}{{ tpl .Values.images.adapter_open_onu.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_onu.tag . ) . }}'
-        imagePullPolicy: {{ tpl .Values.images.adapter_open_onu.pullPolicy . }}
-        command: [ "sh", "-c"]
-        args:
-          - "REPLICA_ID=$(echo $VOLTHA_POD_NAME | grep -o '.$') && REPLICA_ID=$((REPLICA_ID + 1)) && echo $REPLICA_ID && python /voltha/adapters/brcm_openomci_onu/main.py
-              --kafka_adapter={{ tpl .Values.services.kafka.adapter.service . }}:{{ .Values.services.kafka.adapter.port }}
-              --kafka_cluster={{ tpl .Values.services.kafka.cluster.service . }}:{{ .Values.services.kafka.cluster.port }}
-              --core_topic={{ tpl .Values.adapter_open_onu.topics.core_topic . }}
-              --adapter_topic={{ tpl .Values.adapter_open_onu.topics.adapter_open_olt_topic . }}
-              --name={{ tpl .Values.adapter_open_onu.topics.adapter_open_onu_topic . }}
-              --backend=etcd
-              --etcd={{ tpl .Values.services.etcd.service . }}:{{ .Values.services.etcd.port }}
-              --probe=:8080
-              --log_level={{ tpl .Values.adapter_open_onu.log_level . | upper }}
-              --totalReplicas={{ .Values.replicas.adapter_open_onu }}
-              --currentReplica=$REPLICA_ID
-              --accept_incremental_evto_update={{ tpl .Values.adapter_open_onu.incremental_evto_update . }}"
-        {{- if .Values.securityContext.enabled }}
-        securityContext:
-          allowPrivilegeEscalation: false
-        {{- end }}
-        readinessProbe:
-          httpGet:
-            path: /readz
-            port: 8080
-          initialDelaySeconds: 10
-          periodSeconds: 5
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-          initialDelaySeconds: 10
-          periodSeconds: 5
-        env:
-        - name: VOLTHA_POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: COMPONENT_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.labels['app.kubernetes.io/name']
-        - name: KV_STORE_DATAPATH_PREFIX
-          value: {{ tpl .Values.adapter_open_onu.kv_store_data_prefix . }}
-{{- end }}
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 27ec388..b60205e 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-use_openonu_adapter_go: true
 
 nameOverride: ~
 fullNameOverride: ~
@@ -118,11 +117,6 @@
     adapter_open_onu_topic: "{{ .Values.global.stack_name }}_brcm_openomci_onu"
 
 images:
-  adapter_open_onu:
-    registry: '{{ .Values.global.image_registry }}'
-    repository: '{{ .Values.global.image_org }}voltha-openonu-adapter'
-    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.7.0{{- end }}{{- else }}2.7.0{{- end }}'
-    pullPolicy: '{{ .Values.global.image_pullPolicy }}'
   adapter_open_onu_go:
     registry: '{{ .Values.global.image_registry }}'
     repository: '{{ .Values.global.image_org }}voltha-openonu-adapter-go'
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 8308e53..c195c12 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,16 +28,16 @@
 name: voltha-stack
 
 appVersion: "1.0"
-version: 0.1.10
+version: 0.1.11
 
 dependencies:
   - name: voltha
     repository: file://../voltha
-    version: 2.8.1
+    version: 2.8.2
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
-    version: 2.7.12
+    version: 2.7.13
     condition: voltha-adapter-openonu.enabled
   - name: voltha-adapter-openolt
     repository: file://../voltha-adapter-openolt
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index f717ccd..d984447 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.8.1"
+version: "2.8.2"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 644bba3..82ad208 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -91,7 +91,7 @@
   ofagent:
     registry: '{{ .Values.global.image_registry }}'
     repository: '{{ .Values.global.image_org }}voltha-ofagent-go'
-    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}1.4.2{{- end }}{{- else }}1.4.2{{- end }}'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}1.5.2{{- end }}{{- else }}1.5.2{{- end }}'
     pullPolicy: '{{ .Values.global.image_pullPolicy }}'
 
   rw_core: