diff --git a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
index 9ae135e..2e9a0d3 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
@@ -92,7 +92,7 @@
         container_name: null
 
   web_power_switch:
-    ip: 'pdu02.berlin-lab.lfbroadband.org'
+    ip: 'pdu01.berlin-lab.lfbroadband.org'
     user: 'admin'
     password: 'secret'
     type: 'EPC'
diff --git a/deployment-configs/berlin-community-pod-1-gpon-TT.yaml b/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
index 0d163ae..c0dd8ae 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
@@ -63,20 +63,83 @@
   hosts:
     src:
       -
-        ip: node-3.berlin-lab.lfbroadband.org
+        ip: node-5.berlin-lab.lfbroadband.org
         user: community
         pass: admin
         dp_iface_name: eth1.35
         container_type: LXC
-        container_name: SCOM00001C82
-        onu: SCOM00001c82
+        container_name: SCOMA030600F
+        onu: SCOMa030600f
         olt: 722033038194
         c_tag: 801
         s_tag: 111
-        power_switch_port: 4
+        power_switch_port: 8
         onu_type: 'scom'
         service_type: 'hsia'
         uni_id: 1
+      -
+        ip: node-5.berlin-lab.lfbroadband.org
+        user: community
+        pass: admin
+        dp_iface_name: eth1.65
+        container_type: LXC
+        container_name: SCOMA030600F
+        onu: SCOMa030600f
+        olt: 722033038194
+        c_tag: 444
+        s_tag: 333
+        power_switch_port: 8
+        onu_type: 'scom'
+        service_type: 'voip'
+        uni_id: 1
+      -
+        ip: node-5.berlin-lab.lfbroadband.org
+        user: community
+        pass: admin
+        dp_iface_name: eth1.55
+        container_type: LXC
+        container_name: SCOMA030600F
+        onu: SCOMa030600f
+        olt: 722033038194
+        c_tag: 55
+        s_tag: 555
+        power_switch_port: 8
+        onu_type: 'scom'
+        service_type: 'vod'
+        uni_id: 1
+      -
+        ip: node-5.berlin-lab.lfbroadband.org
+        user: community
+        pass: admin
+        dp_iface_name: eth1.55
+        container_type: LXC
+        container_name: SCOMA030600F
+        onu: SCOMa030600f
+        olt: 722033038194
+        c_tag: 55
+        s_tag: 550
+        power_switch_port: 8
+        onu_type: 'scom'
+        mcast_rg: '10.11.6.3/24'
+        mcast_grp_subnet_mask: '224.0.0.0/4'
+        service_type: 'mcast'
+        uni_id: 1
+
+#      -
+#        ip: node-3.berlin-lab.lfbroadband.org
+#        user: community
+#        pass: admin
+#        dp_iface_name: eth1.35
+#        container_type: LXC
+#        container_name: SCOM00001C82
+#        onu: SCOM00001c82
+#        olt: 722033038194
+#        c_tag: 801
+#        s_tag: 111
+#        power_switch_port: 4
+#        onu_type: 'scom'
+#        service_type: 'hsia'
+#        uni_id: 1
 #      -
 #        ip: 10.34.90.42
 #        user: community
@@ -92,21 +155,21 @@
 #        onu_type: 'scom'
 #        service_type: 'hsia'
 #        uni_id: 1
-      -
-        ip: node-3.berlin-lab.lfbroadband.org
-        user: community
-        pass: admin
-        dp_iface_name: eth1.65
-        container_type: LXC
-        container_name: SCOM00001C82
-        onu: SCOM00001c82
-        olt: 722033038194
-        c_tag: 444
-        s_tag: 333
-        power_switch_port: 4
-        onu_type: 'scom'
-        service_type: 'voip'
-        uni_id: 1
+#      -
+#        ip: node-3.berlin-lab.lfbroadband.org
+#        user: community
+#        pass: admin
+#        dp_iface_name: eth1.65
+#        container_type: LXC
+#        container_name: SCOM00001C82
+#        onu: SCOM00001c82
+#        olt: 722033038194
+#        c_tag: 444
+#        s_tag: 333
+#        power_switch_port: 4
+#        onu_type: 'scom'
+#        service_type: 'voip'
+#        uni_id: 1
 #      -
 #        ip: 10.34.90.42
 #        user: community
@@ -122,21 +185,21 @@
 #        onu_type: 'scom'
 #        service_type: 'voip'
 #        uni_id: 1
-      -
-        ip: node-3.berlin-lab.lfbroadband.org
-        user: community
-        pass: admin
-        dp_iface_name: eth1.55
-        container_type: LXC
-        container_name: SCOM00001C82
-        onu: SCOM00001c82
-        olt: 722033038194
-        c_tag: 55
-        s_tag: 555
-        power_switch_port: 4
-        onu_type: 'scom'
-        service_type: 'vod'
-        uni_id: 1
+#      -
+#        ip: node-3.berlin-lab.lfbroadband.org
+#        user: community
+#        pass: admin
+#        dp_iface_name: eth1.55
+#        container_type: LXC
+#        container_name: SCOM00001C82
+#        onu: SCOM00001c82
+#        olt: 722033038194
+#        c_tag: 55
+#        s_tag: 555
+#        power_switch_port: 4
+#        onu_type: 'scom'
+#        service_type: 'vod'
+#        uni_id: 1
 #      -
 #        ip: 10.34.90.42
 #        user: community
@@ -152,23 +215,23 @@
 #        onu_type: 'scom'
 #        service_type: 'vod'
 #        uni_id: 1
-      -
-        ip: node-3.berlin-lab.lfbroadband.org
-        user: community
-        pass: admin
-        dp_iface_name: eth1.55
-        container_type: LXC
-        container_name: SCOM00001C82
-        onu: SCOM00001c82
-        olt: 722033038194
-        c_tag: 55
-        s_tag: 550
-        power_switch_port: 4
-        onu_type: 'scom'
-        mcast_rg: '10.11.6.3/24'
-        mcast_grp_subnet_mask: '224.0.0.0/4'
-        service_type: 'mcast'
-        uni_id: 1
+#      -
+#        ip: node-3.berlin-lab.lfbroadband.org
+#        user: community
+#        pass: admin
+#        dp_iface_name: eth1.55
+#        container_type: LXC
+#        container_name: SCOM00001C82
+#        onu: SCOM00001c82
+#        olt: 722033038194
+#        c_tag: 55
+#        s_tag: 550
+#        power_switch_port: 4
+#        onu_type: 'scom'
+#        mcast_rg: '10.11.6.3/24'
+#        mcast_grp_subnet_mask: '224.0.0.0/4'
+#        service_type: 'mcast'
+#        uni_id: 1
     dst:  
       -
         #HSI
@@ -264,7 +327,7 @@
         container_name: null
 
   web_power_switch:
-    ip: 'pdu02.berlin-lab.lfbroadband.org'
+    ip: 'pdu01.berlin-lab.lfbroadband.org'
     user: 'admin'
     password: 'secret'
     type: 'EPC'
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 348bce4..990faec 100644
--- a/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
@@ -101,7 +101,7 @@
 #        olt: S210Z14009247
 #        c_tag: 7
 #        s_tag: 12
-#        power_switch_port: 8
+#        power_switch_port: 7
 #        uni_id: 1
       -
         ip: node-3.berlin-lab.lfbroadband.org
@@ -114,7 +114,7 @@
         olt: S210Z14009247
         c_tag: 7
         s_tag: 11
-        power_switch_port: 7
+        power_switch_port: 6
         uni_id: 1
 
     dst:
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 f721879..7b749f6 100644
--- a/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
@@ -119,7 +119,7 @@
 #        container_name: null
 
   web_power_switch:
-    ip: 'pdu01.berlin-lab.lfbroadband.org'
+    ip: 'pdu02.berlin-lab.lfbroadband.org'
     user: 'admin'
     password: 'secret'
     type: 'EPC'
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 c4b9a47..6031d4a 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
@@ -74,7 +74,7 @@
         olt: S210Z14009247
         c_tag: 7
         s_tag: 11
-        power_switch_port: 7
+        power_switch_port: 6
         uni_id: 1
 #      -
 #        ip: node-3.berlin-lab.lfbroadband.org
@@ -87,7 +87,7 @@
 #        olt: S210Z14009247
 #        c_tag: 7
 #        s_tag: 12
-#        power_switch_port: 8
+#        power_switch_port: 7
 #        uni_id: 1
 
     dst:
diff --git a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
index 200a740..4179b09 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
@@ -71,7 +71,7 @@
       olt: S210Z14009247
       c_tag: 801
       s_tag: 111
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       service_type: hsia
       uni_id: 1
@@ -86,7 +86,7 @@
       olt: S210Z14009247
       c_tag: 444
       s_tag: 333
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       service_type: voip
       uni_id: 1
@@ -101,7 +101,7 @@
       olt: S210Z14009247
       c_tag: 55
       s_tag: 555
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       service_type: vod
       uni_id: 1
@@ -116,7 +116,7 @@
       olt: S210Z14009247
       c_tag: 55
       s_tag: 550
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       mcast_rg: '10.11.6.3/24'
       mcast_grp_subnet_mask: '224.0.0.0/4'