diff --git a/tosca-configs/bbsim/bbsim-16.yaml b/tosca-configs/bbsim/bbsim-16.yaml
index 0d27f4b..0e4216d 100644
--- a/tosca-configs/bbsim/bbsim-16.yaml
+++ b/tosca-configs/bbsim/bbsim-16.yaml
@@ -39,7 +39,8 @@
       type: tosca.nodes.OLTDevice
       properties:
         name: BBSIM_OLT
-        device_type: bbsimolt
+        # device_type: bbsimolt
+        device_type: openolt
         host: bbsim.voltha.svc
         port: 50060
         switch_datapath_id: of:0000000000000002
@@ -65,7 +66,7 @@
       properties:
         serial_number: BBSM00000100
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -76,7 +77,7 @@
       properties:
         serial_number: BBSM00000101
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -87,7 +88,7 @@
       properties:
         serial_number: BBSM00000102
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -98,7 +99,7 @@
       properties:
         serial_number: BBSM00000103
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -109,7 +110,7 @@
       properties:
         serial_number: BBSM00000104
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -120,7 +121,7 @@
       properties:
         serial_number: BBSM00000105
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -131,7 +132,7 @@
       properties:
         serial_number: BBSM00000106
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -142,7 +143,7 @@
       properties:
         serial_number: BBSM00000107
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -153,7 +154,7 @@
       properties:
         serial_number: BBSM00000108
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -164,7 +165,7 @@
       properties:
         serial_number: BBSM00000109
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -175,7 +176,7 @@
       properties:
         serial_number: BBSM0000010a
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -186,7 +187,7 @@
       properties:
         serial_number: BBSM0000010b
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -197,7 +198,7 @@
       properties:
         serial_number: BBSM0000010c
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -208,7 +209,7 @@
       properties:
         serial_number: BBSM0000010d
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -219,7 +220,7 @@
       properties:
         serial_number: BBSM0000010e
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
@@ -230,7 +231,7 @@
       properties:
         serial_number: BBSM0000010f
         pon_port_id: 536870913
-        device_id: of:0000000000000012
+        device_id: of:0000626273696d76
       requirements:
         - owner:
             node: service#att
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
index 63a3f44..ee1cc21 100644
--- a/tosca-configs/bbsim/bbsim-2.yaml
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -39,7 +39,8 @@
       type: tosca.nodes.OLTDevice
       properties:
         name: BBSIM_OLT
-        device_type: bbsimolt
+        # device_type: bbsimolt
+        device_type: openolt
         host: bbsim.voltha.svc
         port: 50060
         switch_datapath_id: of:0000000000000002