diff --git a/tosca-configs/att-workflow/adtran-munich-olt.yaml b/tosca-configs/att-workflow/adtran-munich-olt.yaml
index 6423ccd..a51ff5a 100644
--- a/tosca-configs/att-workflow/adtran-munich-olt.yaml
+++ b/tosca-configs/att-workflow/adtran-munich-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "50"
         outer_tpid: "0x8100"
+        uplink: "1"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/bbwf-cig-olt.yaml b/tosca-configs/att-workflow/bbwf-cig-olt.yaml
index f52c05c..ad5dbdf 100755
--- a/tosca-configs/att-workflow/bbwf-cig-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-cig-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "51"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
         serial_number: "192.168.100.113:10400"
       requirements:
diff --git a/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml b/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml
index 4fb2a20..cc0d83b 100755
--- a/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "49"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
         serial_number: "192.168.100.111:9191"
       requirements:
diff --git a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
index 5d1985a..6db62e5 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "49"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
index b50567c..a00311b 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000cc37ab5b6da8
         switch_port: "7"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
index b50567c..a00311b 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000cc37ab5b6da8
         switch_port: "7"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/onf-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
index 9029d4a..35b1607 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
         serial_number: "192.168.100.111:9191"
       requirements:
diff --git a/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
index c0c975b..2ab8a89 100755
--- a/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
@@ -46,6 +46,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "3"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
index 326cc68..8e0daf5 100755
--- a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index 2c807c2..c94b5e1 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -45,6 +45,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "4"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
index 45f86b2..bcfa161 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/onlab-pod1-shad.yaml b/tosca-configs/att-workflow/onlab-pod1-shad.yaml
index f7f64b4..ebf19ae 100755
--- a/tosca-configs/att-workflow/onlab-pod1-shad.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-shad.yaml
@@ -43,6 +43,7 @@
         switch_datapath_id: of:0000000000000001
         switch_port: "2"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/att-workflow/onlab-pod2-olt.yaml b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
index ff457fe..f712a1a 100755
--- a/tosca-configs/att-workflow/onlab-pod2-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
@@ -39,6 +39,7 @@
         switch_datapath_id: of:0000000000000002
         switch_port: "1"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
       requirements:
         - volt_service:
diff --git a/tosca-configs/bbsim/bbsim-16.yaml b/tosca-configs/bbsim/bbsim-16.yaml
index 9e61d90..0d27f4b 100644
--- a/tosca-configs/bbsim/bbsim-16.yaml
+++ b/tosca-configs/bbsim/bbsim-16.yaml
@@ -45,6 +45,7 @@
         switch_datapath_id: of:0000000000000002
         switch_port: "3"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
         serial_number: "bbsim.voltha.svc:50060"
       requirements:
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
index 5f08d15..63a3f44 100644
--- a/tosca-configs/bbsim/bbsim-2.yaml
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -45,6 +45,7 @@
         switch_datapath_id: of:0000000000000002
         switch_port: "3"
         outer_tpid: "0x8100"
+        uplink: "65536"
         nas_id: "NAS_ID"
         serial_number: "bbsim.voltha.svc:50060"
       requirements:
diff --git a/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml b/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
index a5d260e..19e8d27 100755
--- a/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
@@ -40,6 +40,7 @@
         switch_datapath_id: of:0000cc37ab5b6da8
         switch_port: "7"
         outer_tpid: "0x8100"
+        uplink: "65536"
       requirements:
         - volt_service:
             node: service#volt
diff --git a/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml b/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
index a5d260e..19e8d27 100755
--- a/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
@@ -40,6 +40,7 @@
         switch_datapath_id: of:0000cc37ab5b6da8
         switch_port: "7"
         outer_tpid: "0x8100"
+        uplink: "65536"
       requirements:
         - volt_service:
             node: service#volt