diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 4090902..3f609f1 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -1,4 +1,3 @@
----
 # Copyright 2019-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +11,7 @@
 # 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.
+---
 
 # Default overrides
 defaults:
@@ -23,25 +23,32 @@
   topics:
     core_topic: "rwcore"
     adapter_open_olt_topic: "openolt"
-  
+
   # Define prefix path for etcd
-  # If you're running multiple voltha stacks the this value 
+  # If you're running multiple voltha stacks the this value
   # should be unique across the stacks.
   kv_store_data_prefix: "service/voltha"
 
+# Default security context under which the containers run
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+  runAsGroup: 1001
+
 # Define connectivity to required services
 services:
   kafka:
     adapter:
-      service: voltha-kafka.voltha.svc.cluster.local
+      service: kafka
       port: 9092
     cluster:
-      service: voltha-kafka.voltha.svc.cluster.local
+      service: kafka
       port: 9092
 
   # Define connectivity to etcd
   etcd:
-    service: voltha-etcd-cluster-client.voltha.svc.cluster.local
+    service: etcd
     port: 2379
 
 # Expose the golang pprof webserver, if enabled