diff --git a/full-values.yaml b/full-values.yaml
index 55a1a41..00800a6 100644
--- a/full-values.yaml
+++ b/full-values.yaml
@@ -18,6 +18,8 @@
 images:
   adapter_open_olt:
     tag_go: master-go
+  bbsim:
+    tag: master
 
 onos_env:
 - name: POD_IP
diff --git a/minimal-values.yaml b/minimal-values.yaml
index 8cebab4..1de1d9d 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -18,6 +18,8 @@
 images:
   adapter_open_olt:
     tag_go: master-go
+  bbsim:
+    tag: master
 
 deployments:
   etcdOperator: true
diff --git a/onos-files/olt-onos-netcfg.json b/onos-files/olt-onos-netcfg.json
index 6fd4486..8a47b49 100644
--- a/onos-files/olt-onos-netcfg.json
+++ b/onos-files/olt-onos-netcfg.json
@@ -45,8 +45,7 @@
     },
     "org.opencord.dhcpl2relay": {
       "dhcpl2relay" : {
-        "dhcpServerConnectPoints" : [ "of:0000000000000001/1" ],
-        "useOltUplinkForServerPktInOut" : false
+        "useOltUplinkForServerPktInOut": true
       }
     }
   }