diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index 528c209..d12816b 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -29,12 +29,12 @@
 name: voltha-infra
 
 appVersion: "2.8-dev"
-version: 0.2.1
+version: 0.2.2
 
 dependencies:
   - name: onos-classic
     repository: https://charts.onosproject.org
-    version: 0.1.15
+    version: 0.1.16
     condition: onos-classic.enabled
   - name: bbsim-sadis-server
     repository: https://charts.opencord.org
diff --git a/voltha-infra/values.yaml b/voltha-infra/values.yaml
index d6156cc..37d85db 100644
--- a/voltha-infra/values.yaml
+++ b/voltha-infra/values.yaml
@@ -32,10 +32,6 @@
 onos-classic:
   enabled: true
   replicas: 1
-  atomix:
-    replicas: 0
-    persistence:
-      enabled: false
   image:
     pullPolicy: Always
     repository: voltha/voltha-onos
@@ -53,6 +49,19 @@
     - org.opencord.mcast
     - org.opencord.olt
     - org.opencord.aaa
+  java_opts: >
+    -XX:+UseG1GC
+    -XX:MaxGCPauseMillis=200
+    -XX:-UseContainerSupport
+    -Dkaraf.log.console=INFO
+    -Dds.lock.timeout.milliseconds=10000
+  atomix:
+    replicas: 0
+    persistence:
+      enabled: false
+    java_opts: >
+      -Xmx2G
+      -XX:-UseContainerSupport
 
 bbsim-sadis-server:
   enabled: true