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