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 f243156..008f852 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
@@ -64,19 +64,6 @@
     src:
       #xgspon ONU
       -
-        ip: node-6.berlin-lab.lfbroadband.org
-        user: community
-        pass: admin
-        dp_iface_name: eth1.7
-        container_type: LXC
-        container_name: ZYXE8CABE30B
-        onu: ZYXE8cabe30b
-        olt: S210Z14009247
-        c_tag: 7
-        s_tag: 41
-        power_switch_port: 5
-        uni_id: 1
-      -
         ip: node-3.berlin-lab.lfbroadband.org
         user: community
         pass: admin
@@ -105,19 +92,6 @@
 
     dst:
       -
-        dp_iface_ip_qinq: 10.41.7.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: bng.berlin-lab.lfbroadband.org
-        noroot_user: community
-        noroot_pass: admin
-        dp_iface_name: enp7s0
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-      -
         dp_iface_ip_qinq: 10.11.7.254
         ip: null
         user: null
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 7155679..9c7aa78 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
@@ -66,13 +66,13 @@
       pass: admin
       dp_iface_name: eth1.35
       container_type: LXC
-      container_name: ZYXE8CABE30B
-      onu: ZYXE8cabe30b
+      container_name: ALPHE3A69D03
+      onu: ALPHe3a69d03
       olt: S210Z14009247
       c_tag: 801
       s_tag: 111
-      power_switch_port: 5
-      onu_type: zyxel
+      power_switch_port: 7
+      onu_type: alpha
       service_type: hsia
       uni_id: 1
     -
@@ -81,13 +81,13 @@
       pass: admin
       dp_iface_name: eth1.65
       container_type: LXC
-      container_name: ZYXE8CABE30B
-      onu: ZYXE8cabe30b
+      container_name: ALPHE3A69D03
+      onu: ALPHe3a69d03
       olt: S210Z14009247
       c_tag: 444
       s_tag: 333
-      power_switch_port: 5
-      onu_type: zyxel
+      power_switch_port: 7
+      onu_type: alpha
       service_type: voip
       uni_id: 1
     -
@@ -96,13 +96,13 @@
       pass: admin
       dp_iface_name: eth1.55
       container_type: LXC
-      container_name: ZYXE8CABE30B
-      onu: ZYXE8cabe30b
+      container_name: ALPHE3A69D03
+      onu: ALPHe3a69d03
       olt: S210Z14009247
       c_tag: 55
       s_tag: 555
-      power_switch_port: 5
-      onu_type: zyxel
+      power_switch_port: 7
+      onu_type: alpha
       service_type: vod
       uni_id: 1
     -
@@ -111,13 +111,13 @@
       pass: admin
       dp_iface_name: eth1.55
       container_type: LXC
-      container_name: ZYXE8CABE30B
-      onu: ZYXE8cabe30b
+      container_name: ALPHE3A69D03
+      onu: ALPHe3a69d03
       olt: S210Z14009247
       c_tag: 55
       s_tag: 550
-      power_switch_port: 5
-      onu_type: zyxel'
+      power_switch_port: 7
+      onu_type: alpha
       mcast_rg: '10.11.6.3/24'
       mcast_grp_subnet_mask: '224.0.0.0/4'
       service_type: mcast