diff --git a/samples/pon_port.yaml b/samples/pon_port.yaml
index 28218e2..684238e 100644
--- a/samples/pon_port.yaml
+++ b/samples/pon_port.yaml
@@ -20,6 +20,7 @@
   - custom_types/onudevice.yaml
   - custom_types/ponport.yaml
   - custom_types/voltservice.yaml
+  - custom_types/uniport.yaml
 description: Create a simulated OLT Device in VOLTHA
 topology_template:
   node_templates:
@@ -41,7 +42,7 @@
             node: device#olt
             relationship: tosca.relationships.BelongsToOne
 
-    onu:
+    device#onu:
       type: tosca.nodes.ONUDevice
       properties:
         serial_number: BRCM1234
@@ -50,3 +51,13 @@
         - pon_port:
             node: pon_port
             relationship: tosca.relationships.BelongsToOne
+    
+    uni_port:
+      type: tosca.nodes.UNIPort
+      properties:
+        name: test_uni_port_1
+        port_no: 2
+      requirements:
+        - onu_device:
+            node: device#onu
+            relationship: tosca.relationships.BelongsToOne
diff --git a/samples/subscriber.yaml b/samples/subscriber.yaml
index 4b38bb4..1c38756 100644
--- a/samples/subscriber.yaml
+++ b/samples/subscriber.yaml
@@ -26,7 +26,6 @@
       properties:
         name: My House
         c_tag: 111
-        onu_device: BRCM1234
-        uni_port_id: 101
+        onu_device: 691d51a676f348319ca91972bc2bddcf
         mac_address: 00:AA:00:00:00:01
         ip_address: 10.8.2.1