diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index b9b0087..a5f215a 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -5,9 +5,9 @@
   onos:
       tag: '1.13.5'
 
-#  vcore:
-#      repository: 'smbaker/voltha-voltha'
-#      tag: 'quiet'
+  vcore:
+      repository: '10.90.0.120:30500/voltha/voltha-voltha'
+      tag: 'dev'
 
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
index dc448a9..607f2f2 100644
--- a/tosca-configs/bbsim/bbsim-2.yaml
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -122,6 +122,9 @@
         c_tag: 900
         s_tag: 999
         onu_device: BBSM00000100
+        circuit_id: circuit0
+        remote_id: remote0
+        nas_port_id: PON 2/1/01/1:1.1.0
 
     bbsim_subscriber_1:
       type: tosca.nodes.RCORDSubscriber
@@ -131,3 +134,6 @@
         c_tag: 901
         s_tag: 999
         onu_device: BBSM00000101
+        circuit_id: circuit1
+        remote_id: remote1
+        nas_port_id: PON 2/1/01/1:1.1.1