diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index a315cb9..1df96a2 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -63,6 +63,7 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
+        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -75,6 +76,7 @@
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
+        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -87,6 +89,7 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
+        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -99,6 +102,7 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
+        onu_type: 'sercomm'
   
     dst:
       -
@@ -147,4 +151,4 @@
     user: 'admin'
     password: 'secret'
     type: 'EPC'
-  
\ No newline at end of file
+  
diff --git a/deployment-configs/dt-berlin-pod-kubespray.yaml b/deployment-configs/dt-berlin-pod-kubespray.yaml
index 07a203c..01a7296 100644
--- a/deployment-configs/dt-berlin-pod-kubespray.yaml
+++ b/deployment-configs/dt-berlin-pod-kubespray.yaml
@@ -83,6 +83,7 @@
       onu: ALPHe3d1cf5c
       c_tag: 11
       s_tag: 11
+      onu_type: 'alpha'
     #GPON ONU
     # -
     #   ip: 127.0.0.1
@@ -115,4 +116,4 @@
     #   dp_iface_ip: null
     #   dp_iface_gateway: null
     #   container_type: null
-    #   container_name: null
\ No newline at end of file
+    #   container_name: null
diff --git a/deployment-configs/dt-berlin-pod-multi-olt.yaml b/deployment-configs/dt-berlin-pod-multi-olt.yaml
index ed4807c..add0a01 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt.yaml
@@ -74,6 +74,7 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
+        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -86,6 +87,7 @@
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
+        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -98,6 +100,7 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
+        onu_type: 'sercomm'
        -
         ip: 10.34.90.42
         user: community
@@ -110,6 +113,7 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
+        onu_type: 'sercomm'
 
         #XGSPON ONU
       -
@@ -124,6 +128,7 @@
         c_tag: 11
         s_tag: 11
         power_switch_port: 6
+        onu_type: 'alpha'
       -
         ip: 127.0.0.1
         user: community
@@ -136,6 +141,7 @@
         c_tag: 7
         s_tag: 11
         power_switch_port: 8
+        onu_type: 'alpha'
 
     dst:
       -
@@ -203,4 +209,4 @@
     ip: '10.34.90.48'
     user: 'admin'
     password: 'secret'
-    type: 'EPC'
\ No newline at end of file
+    type: 'EPC'
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index 27a8b36..3c0a7cd 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -64,6 +64,7 @@
       c_tag: 11
       s_tag: 11
       power_switch_port: 6
+      onu_type: 'alpha'
     -
       ip: 127.0.0.1
       user: community
@@ -76,6 +77,7 @@
       c_tag: 7
       s_tag: 11
       power_switch_port: 8
+      onu_type: 'alpha'
 
   dst:
     -
diff --git a/deployment-configs/flex-ocp-cord-voltha-master.yaml b/deployment-configs/flex-ocp-cord-voltha-master.yaml
index 5d75f06..af2f4f4 100644
--- a/deployment-configs/flex-ocp-cord-voltha-master.yaml
+++ b/deployment-configs/flex-ocp-cord-voltha-master.yaml
@@ -62,6 +62,7 @@
       onu: 'ALPHe3d1cfa7'
       c_tag: '999'
       s_tag: '111'
+      onu_type: 'alpha'
 
   dst:
     -
@@ -73,4 +74,4 @@
       dp_iface_ip: '10.8.3.1'
       dp_iface_gateway: '10.8.3.254'
       container_type: null
-      container_name: null
\ No newline at end of file
+      container_name: null
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index ca675e4..3ad585e 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -70,6 +70,7 @@
       c_tag: '901'
       s_tag: '111'
       power_switch_port: 5
+      onu_type: 'alpha'
     -
       ip: '10.192.20.61'
       user: 'cord'
@@ -82,6 +83,7 @@
       c_tag: '801'
       s_tag: '111'
       power_switch_port: 1
+      onu_type: 'alpha'
     -
       ip: '10.192.20.46'
       user: 'cord'
@@ -94,6 +96,7 @@
       c_tag: '101'
       s_tag: '222'
       power_switch_port: 2
+      onu_type: 'alpha'
 
   dst:
     -
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index ccbc402..fc12aeb 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -61,6 +61,7 @@
       onu: 'ISKT71e82118'
       c_tag: '222'
       s_tag: '111'
+      onu_type: 'iskratel'
 
   dst:
     -
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 417670b..5c5dc85 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -73,6 +73,7 @@
       c_tag: '22'
       s_tag: '22'
       power_switch_port: 1
+      onu_type: 'alpha'
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -85,6 +86,7 @@
       c_tag: '33'
       s_tag: '33'
       power_switch_port: 5
+      onu_type: 'alpha'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index dbaf2d0..2c3f24d 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -73,6 +73,7 @@
       c_tag: '22'
       s_tag: '99'
       power_switch_port: 1
+      onu_type: 'alpha'
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -85,6 +86,7 @@
       c_tag: '33'
       s_tag: '99'
       power_switch_port: 5
+      onu_type: 'alpha'
   dst:
     -
       ip: null
diff --git a/deployment-configs/onlab-pod1-qa.yaml b/deployment-configs/onlab-pod1-qa.yaml
index 3c6881b..f4d40de 100644
--- a/deployment-configs/onlab-pod1-qa.yaml
+++ b/deployment-configs/onlab-pod1-qa.yaml
@@ -71,6 +71,7 @@
       onu: 'ALPHe3d1cfde'
       c_tag: '112'
       s_tag: '111'
+      onu_type: 'alpha'
 
     -
       ip: '10.90.0.51'
@@ -82,6 +83,7 @@
       onu: 'ISKT71e80080'
       c_tag: '113'
       s_tag: '111'
+      onu_type: 'iskratel'
     -
       ip: '10.90.0.51'
       user: 'ubuntu'
@@ -92,6 +94,7 @@
       onu: 'BRCM22222222'
       c_tag: '114'
       s_tag: '110'
+      onu_type: 'brcm'
 
   dst:
     -
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 8f31c71..5cc5440 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -77,6 +77,7 @@
       olt: 'EC1721000216'
       c_tag: '112'
       s_tag: '111'
+      onu_type: 'alpha'
 
   dst:
     -
diff --git a/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index d73b748..404f347 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -51,6 +51,7 @@
       onu: ALPHe3d1ce7b
       c_tag: 11
       s_tag: 11
+      onu_type: 'alpha'
     -
       ip: 127.0.0.1
       user: cord
@@ -61,6 +62,7 @@
       onu: ISKT71e801a0
       c_tag: 12
       s_tag: 11
+      onu_type: 'iskratel'
     -
       ip: 127.0.0.1
       user: cord
@@ -71,6 +73,7 @@
       onu: ALPHe3d1cfac
       c_tag: 21
       s_tag: 21
+      onu_type: 'alpha'
 
   dst:
     -