diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index 559557e..ffe12d6 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -27,6 +27,6 @@
 
 ## Chart version for package voltha-stack
 ##   Increment when Chart.yaml changes
-version: "0.1.5"
+version: "0.1.6"
 
 # [EOF]
diff --git a/voltha-go-controller/templates/deployment.yaml b/voltha-go-controller/templates/deployment.yaml
index 39655f8..0e2ffa0 100644
--- a/voltha-go-controller/templates/deployment.yaml
+++ b/voltha-go-controller/templates/deployment.yaml
@@ -29,7 +29,9 @@
         app: "{{ .Chart.Name }}"
     spec:
       containers:
-      - env:
+      - args:
+          - "/app/voltha-go-controller"
+        env:
         - name: POD_IP
           valueFrom:
             fieldRef:
@@ -54,13 +56,54 @@
           value: "9092"
         - name: LOG_LEVEL
           value: .Values.global.log_level
+        - name: KV_STORE_TIMEOUT
+          value: "3000000000"
+        - name: DEVICE_SYNC_DURATION
+          value: "10"
+        - name: MAX_FLOW_RETRY_DURATION
+          value: "60"
+        - name: LIVE_PROBE_INTERVAL
+          value: "60"
+        - name: NOT_LIVE_PROBE_INTERVAL
+          value: "5"
+        name: voltha-go-controller
         image: '{{ tpl .Values.images.voltha_go_controller.registry . }}{{ tpl .Values.images.voltha_go_controller.repository . }}:{{ tpl ( tpl .Values.images.voltha_go_controller.tag . ) . }}'
         imagePullPolicy: {{ tpl .Values.images.voltha_go_controller.pullPolicy . }}
-        name: voltha-go-controller
+        securityContext:
+          runAsUser: {{ .Values.securityContext.runAsUser }}
+          runAsGroup: {{ .Values.securityContext.runAsGroup }}
+          fsGroup: {{ .Values.securityContext.fsGroup }}
         ports:
         - containerPort: {{ .Values.voltha_go_controller.sshPort }}
           name: ssh-port
         - containerPort: {{ .Values.voltha_go_controller.uiPort }}
           name: ui-port
           protocol: "{{ .Values.voltha_go_controller.uiProtocol }}"
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8090
+          initialDelaySeconds: {{ .Values.probe.liveness.initial_delay_seconds }}
+          periodSeconds: {{ .Values.probe.liveness.period_seconds }}
+        readinessProbe:
+          httpGet:
+            path: /readz
+            port: 8090
+          initialDelaySeconds: {{ .Values.probe.readiness.initial_delay_seconds }}
+          periodSeconds: {{ .Values.probe.readiness.period_seconds }}
+        resources:
+          requests:
+            {{- if .Values.resources.requests.memory }}
+            memory: {{ .Values.resources.requests.memory }}
+            {{- end }}
+            {{- if .Values.resources.requests.cpu }}
+            cpu: {{ .Values.resources.requests.cpu }}
+            {{- end }}
+          limits:
+            {{- if .Values.resources.limits.memory }}
+            memory: {{ .Values.resources.limits.memory }}
+            {{- end }}
+            {{- if .Values.resources.limits.cpu }}
+            cpu: {{ .Values.resources.limits.cpu }}
+            {{- end }}
       restartPolicy: "Always"
diff --git a/voltha-go-controller/values.yaml b/voltha-go-controller/values.yaml
index 54bd9bd..f52276f 100644
--- a/voltha-go-controller/values.yaml
+++ b/voltha-go-controller/values.yaml
@@ -60,13 +60,11 @@
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+  runAsGroup: 1001
 
 service:
   type: ClusterIP
@@ -86,17 +84,26 @@
   #    hosts:
   #      - chart-example.local
 
-resources: {}
+resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+  limits:
+    cpu: 200m
+    memory: 256Mi
+
+#Probe
+probe:
+  liveness:
+    initial_delay_seconds: 3
+    period_seconds: 3
+  readiness:
+    initial_delay_seconds: 3
+    period_seconds: 3
 
 nodeSelector: {}