diff --git a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
index 307f4c2..3149537 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
@@ -37,14 +37,15 @@
       user: 'community'
       pass: 'admin'
 
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.34.90.55
-      user: root
-      pass: onl
-      bngPort: 157
-      device_id: 'of:0000000000000001'
+  fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #  -
+  #    mac: '8c:ea:1b:a7:29:72'
+  #    ip: 10.34.90.55
+  #    user: root
+  #    pass: onl
+  #    bngPort: 157
+  #    device_id: 'of:0000000000000001'
 
   olts:
   # Gpon OLT
diff --git a/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
index 3a0e712..7503559 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
@@ -37,14 +37,15 @@
       user: 'community'
       pass: 'admin'
   
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.34.90.55
-      user: root
-      pass: onl
-      bngPort: 157
-      device_id: 'of:0000000000000001'
+  fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #  -
+  #    mac: '8c:ea:1b:a7:29:72'
+  #    ip: 10.34.90.55
+  #    user: root
+  #    pass: onl
+  #    bngPort: 157
+  #    device_id: 'of:0000000000000001'
   
   olts:
   # Gpon OLT
diff --git a/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml
index b0af959..417f53d 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml
@@ -37,14 +37,15 @@
       user: 'community'
       pass: 'admin'
 
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.34.90.55
-      user: root
-      pass: onl
-      bngPort: 157
-      device_id: 'of:0000000000000001'
+  fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #  -
+  #    mac: '8c:ea:1b:a7:29:72'
+  #    ip: 10.34.90.55
+  #    user: root
+  #    pass: onl
+  #    bngPort: 157
+  #    device_id: 'of:0000000000000001'
 
   olts:
   # Gpon OLT
diff --git a/deployment-configs/berlin-community-pod-1-kubespray.yaml b/deployment-configs/berlin-community-pod-1-kubespray.yaml
index f7bfd46..3bb0324 100644
--- a/deployment-configs/berlin-community-pod-1-kubespray.yaml
+++ b/deployment-configs/berlin-community-pod-1-kubespray.yaml
@@ -41,18 +41,18 @@
     user: 'community'
     pass: 'admin'
 
-fabric_switches:
-  -
-    mac: '??'
-    ip: 10.34.90.55
-    user: root
-    pass: onl
-    bngPort: 32
-    #XGSPON
-    oltPort: 1
-    #GPON
-    #oltPort: 2
-    device_id: 'of:0000000000000001'
+fabric_switches: []
+#  -
+#    mac: '??'
+#    ip: 10.34.90.55
+#    user: root
+#    pass: onl
+#    bngPort: 32
+#    #XGSPON
+#    oltPort: 1
+#    #GPON
+#    #oltPort: 2
+#    device_id: 'of:0000000000000001'
 
 olts:
 # XGS-PON OLT
diff --git a/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
index 832790d..047028a 100644
--- a/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
@@ -37,14 +37,15 @@
       user: 'community'
       pass: 'admin'
 
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.34.90.55
-      user: root
-      pass: onl
-      bngPort: 157
-      device_id: 'of:0000000000000001'
+  fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #  -
+  #    mac: '8c:ea:1b:a7:29:72'
+  #    ip: 10.34.90.55
+  #    user: root
+  #    pass: onl
+  #    bngPort: 157
+  #    device_id: 'of:0000000000000001'
 
   olts:
   # Gpon OLT
diff --git a/deployment-configs/berlin-community-pod-1.yaml b/deployment-configs/berlin-community-pod-1.yaml
index a4d7c0d..defb198 100644
--- a/deployment-configs/berlin-community-pod-1.yaml
+++ b/deployment-configs/berlin-community-pod-1.yaml
@@ -37,14 +37,15 @@
     user: 'community'
     pass: 'admin'
 
-fabric_switches:
-  -
-    mac: '8c:ea:1b:a7:29:72'
-    ip: 10.34.90.55
-    user: root
-    pass: onl
-    bngPort: 157
-    device_id: 'of:0000000000000001'
+fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #-
+  #  mac: '8c:ea:1b:a7:29:72'
+  #  ip: 10.34.90.55
+  #  user: root
+  #  pass: onl
+  #  bngPort: 157
+  #  device_id: 'of:0000000000000001'
 
 olts:
 # XGS-PON OLT
diff --git a/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
index dcca47c..18e7df4 100644
--- a/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
@@ -37,14 +37,15 @@
       user: 'community'
       pass: 'admin'
   
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.34.90.55
-      user: root
-      pass: onl
-      bngPort: 157
-      device_id: 'of:0000000000000001'
+  fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #  -
+  #    mac: '8c:ea:1b:a7:29:72'
+  #    ip: 10.34.90.55
+  #    user: root
+  #    pass: onl
+  #    bngPort: 157
+  #    device_id: 'of:0000000000000001'
   
   olts:
   # Gpon OLT
diff --git a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
index 1ac13ee..f239f4b 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
@@ -37,14 +37,15 @@
       user: 'community'
       pass: 'admin'
   
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.34.90.55
-      user: root
-      pass: onl
-      bngPort: 157
-      device_id: 'of:0000000000000001'
+  fabric_switches: []
+  # The switch is shared across 2 PODs, thus is externally controlled
+  #  -
+  #    mac: '8c:ea:1b:a7:29:72'
+  #    ip: 10.34.90.55
+  #    user: root
+  #    pass: onl
+  #    bngPort: 157
+  #    device_id: 'of:0000000000000001'
   
   olts:
   # XGSPON OLT