diff --git a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
new file mode 100644
index 0000000..39dff1c
--- /dev/null
+++ b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
@@ -0,0 +1,121 @@
+---
+
+  # Copyright 2020-present Open Networking Foundation
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  # http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # Automated deployment configuration for Tucson pod
+
+  # Change default values in tests
+  ONOS_REST_PORT: 30120
+  ONOS_SSH_PORT: 30115
+  OLT_PORT: 9191
+  KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+
+# This tells the control node how to reach the Kubernetes nodes.
+  nodes:
+    -
+      ip: '10.90.0.240'
+      user: 'cord'
+      pass: 'cord'
+    -
+      ip: '10.90.0.241'
+      user: 'cord'
+      pass: 'cord'
+
+  fabric_switches:
+    -
+      mac: '8c:ea:1b:a7:29:72'
+      ip: 10.90.0.243
+      user: root
+      pass: onl
+      bngPort: 31
+      device_id: 'of:0000000000000001'
+
+  olts:
+    -
+      ip:  10.90.0.246
+      sship:  10.90.0.246
+      user: root
+      pass: onl
+      fortygig: True
+      aggPort: 3
+      serial: 722033738988
+      oltDebVersion: openolt_rlt-1600g-w-40g-3.5.1-dev-262b6293cdeda78317dda9d3a6cfab0e7ebfbf05.deb
+      board_technology: GPON
+
+  hosts:
+    src:
+      # 1600G OLT
+      -
+        ip: 10.90.0.240
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.222
+        container_type: LXC
+        container_name: SCOM00001c8d
+        onu: SCOM00001c8d
+        olt: 722033738988
+        c_tag: 222
+        s_tag: 22
+        power_switch_port: 4
+        uni_id: 1
+      -
+        ip: 10.90.0.240
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.333
+        container_type: LXC
+        container_name: SCOM00019ab7
+        onu: SCOM00019ab7
+        olt: 722033738988
+        c_tag: 333
+        s_tag: 33
+        power_switch_port: 8
+        uni_id: 1
+
+    dst:
+
+      #1600G OLT
+      -
+        dp_iface_ip_qinq: 10.22.22.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.90.0.241
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0d1
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        dp_iface_ip_qinq: 10.33.33.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.90.0.241
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0d1
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+
+  web_power_switch:
+    ip: '10.90.0.250'
+    user: 'cord'
+    password: 'cord'
+    type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
new file mode 100644
index 0000000..bc2ebaa
--- /dev/null
+++ b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
@@ -0,0 +1,95 @@
+---
+
+  # Copyright 2020-present Open Networking Foundation
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  # http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # Automated deployment configuration for Tucson pod
+
+  # Change default values in tests
+  ONOS_REST_PORT: 30120
+  ONOS_SSH_PORT: 30115
+  OLT_PORT: 9191
+  KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+
+# This tells the control node how to reach the Kubernetes nodes.
+  nodes:
+    -
+      ip: '10.90.0.240'
+      user: 'cord'
+      pass: 'cord'
+    -
+      ip: '10.90.0.241'
+      user: 'cord'
+      pass: 'cord'
+
+  fabric_switches:
+    -
+      mac: '8c:ea:1b:a7:29:72'
+      ip: 10.90.0.243
+      user: root
+      pass: onl
+      bngPort: 31
+      device_id: 'of:0000000000000001'
+
+  olts:
+  # Gpon OLT
+    -
+      ip:  10.90.0.245
+      sship:  10.90.0.245
+      user: root
+      pass: onl
+      fortygig: True
+      aggPort: 1
+      serial: 722033038194
+      oltDebVersion: openolt_rlt-1600x-w-40g-3.5.1-dev-2171f0eddae3c531aeac244a7d6f122f20264d2c.deb
+      board_technology: GPON
+
+  hosts:
+    src:
+      # 1600X OLT
+      -
+        ip: 10.90.0.240
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.88
+        container_type: LXC
+        container_name: SCOMa0108adf
+        onu: SCOMa0108adf
+        olt: 722033038194
+        c_tag: 88
+        s_tag: 89
+        power_switch_port: 7
+        uni_id: 1
+
+    dst:
+      # 1600X OLT
+      -
+        dp_iface_ip_qinq: 10.89.88.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.90.0.241
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0d1
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+
+  web_power_switch:
+    ip: '10.90.0.250'
+    user: 'cord'
+    password: 'cord'
+    type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
new file mode 100644
index 0000000..51022f7
--- /dev/null
+++ b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
@@ -0,0 +1,147 @@
+---
+
+  # Copyright 2020-present Open Networking Foundation
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  # http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # Automated deployment configuration for Tucson pod
+
+  # Change default values in tests
+  ONOS_REST_PORT: 30120
+  ONOS_SSH_PORT: 30115
+  OLT_PORT: 9191
+  KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+
+# This tells the control node how to reach the Kubernetes nodes.
+  nodes:
+    -
+      ip: '10.90.0.240'
+      user: 'cord'
+      pass: 'cord'
+    -
+      ip: '10.90.0.241'
+      user: 'cord'
+      pass: 'cord'
+
+  fabric_switches:
+    -
+      mac: '8c:ea:1b:a7:29:72'
+      ip: 10.90.0.243
+      user: root
+      pass: onl
+      bngPort: 31
+      device_id: 'of:0000000000000001'
+
+  olts:
+  # Gpon OLT
+    -
+      ip:  10.90.0.244
+      sship:  10.90.0.244
+      user: root
+      pass: onl
+      fortygig: True
+      aggPort: 1
+      serial: 722033538840
+      oltDebVersion: openolt_rlt-3200g-w-40g-3.5.1-dev-262b6293cdeda78317dda9d3a6cfab0e7ebfbf05.deb
+      board_technology: GPON
+
+  hosts:
+    src:
+      # 3200G ONU
+      -
+        ip: 10.90.0.241
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.111
+        container_type: LXC
+        container_name: SCOM00001c7f
+        onu: SCOM00001c7f
+        olt: 722033538840
+        c_tag: 111
+        s_tag: 11
+        power_switch_port: 2
+        uni_id: 1
+
+      - ip: 10.90.0.240
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.41
+        container_type: LXC
+        container_name: SCOMa0108af9
+        onu: SCOMa0108af9
+        olt: 722033538840
+        c_tag: 41
+        s_tag: 54
+        power_switch_port: 6
+        uni_id: 1
+
+      - ip: 10.90.0.240
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.42
+        container_type: LXC
+        container_name: SCOMa0108aea
+        onu: SCOMa0108aea
+        olt: 722033538840
+        c_tag: 42
+        s_tag: 55
+        power_switch_port: 5
+        uni_id: 1
+
+    dst:
+      # 3200G OLT
+      -
+        dp_iface_ip_qinq: 10.11.11.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.90.0.241
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0d1
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+
+      - dp_iface_ip_qinq: 10.54.41.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.90.0.241
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0d1
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+
+      - dp_iface_ip_qinq: 10.55.42.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.90.0.241
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0d1
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+
+  web_power_switch:
+    ip: '10.90.0.250'
+    user: 'cord'
+    password: 'cord'
+    type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
deleted file mode 100644
index df75cad..0000000
--- a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
+++ /dev/null
@@ -1,252 +0,0 @@
----
-
-  # Copyright 2020-present Open Networking Foundation
-  #
-  # Licensed under the Apache License, Version 2.0 (the "License");
-  # you may not use this file except in compliance with the License.
-  # You may obtain a copy of the License at
-  #
-  # http://www.apache.org/licenses/LICENSE-2.0
-  #
-  # Unless required by applicable law or agreed to in writing, software
-  # distributed under the License is distributed on an "AS IS" BASIS,
-  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  # See the License for the specific language governing permissions and
-  # limitations under the License.
-
-  # Automated deployment configuration for Tucson pod
-
-  # Change default values in tests
-  ONOS_REST_PORT: 30120
-  ONOS_SSH_PORT: 30115
-  OLT_PORT: 9191
-  KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
-
-# This tells the control node how to reach the Kubernetes nodes.
-  nodes:
-    -
-      ip: '10.90.0.240'
-      user: 'cord'
-      pass: 'cord'
-    -
-      ip: '10.90.0.241'
-      user: 'cord'
-      pass: 'cord'
-
-  fabric_switches:
-    -
-      mac: '8c:ea:1b:a7:29:72'
-      ip: 10.90.0.243
-      user: root
-      pass: onl
-      bngPort: 31
-      device_id: 'of:0000000000000001'
-
-  olts:
-  # Gpon OLT
-    -
-      ip:  10.90.0.244
-      sship:  10.90.0.244
-      user: root
-      pass: onl
-      fortygig: True
-      aggPort: 1
-      serial: 722033538840
-      oltDebVersion: openolt_rlt-3200g-w-40g-3.5.1-dev-262b6293cdeda78317dda9d3a6cfab0e7ebfbf05.deb
-      board_technology: GPON
-    -
-      ip:  10.90.0.246
-      sship:  10.90.0.246
-      user: root
-      pass: onl
-      fortygig: True
-      aggPort: 3
-      serial: 722033738988
-      oltDebVersion: openolt_rlt-1600g-w-40g-3.5.1-dev-262b6293cdeda78317dda9d3a6cfab0e7ebfbf05.deb
-      board_technology: GPON
-    -
-      ip:  10.90.0.245
-      sship:  10.90.0.245
-      user: root
-      pass: onl
-      fortygig: True
-      aggPort: 1
-      serial: 722033038194
-      oltDebVersion: openolt_rlt-1600x-w-40g-3.5.1-dev-2171f0eddae3c531aeac244a7d6f122f20264d2c.deb
-      board_technology: GPON
-
-  hosts:
-    src:
-      # 3200G ONU
-      -
-        ip: 10.90.0.241
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.111
-        container_type: LXC
-        container_name: SCOM00001c7f
-        onu: SCOM00001c7f
-        olt: 722033538840
-        c_tag: 111
-        s_tag: 11
-        power_switch_port: 2
-        uni_id: 1
-
-      - ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.41
-        container_type: LXC
-        container_name: SCOMa0108af9
-        onu: SCOMa0108af9
-        olt: 722033538840
-        c_tag: 41
-        s_tag: 54
-        power_switch_port: 6
-        uni_id: 1
-
-      - ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.42
-        container_type: LXC
-        container_name: SCOMa0108aea
-        onu: SCOMa0108aea
-        olt: 722033538840
-        c_tag: 42
-        s_tag: 55
-        power_switch_port: 5
-        uni_id: 1
-
-      # 1600G OLT
-      -
-        ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.222
-        container_type: LXC
-        container_name: SCOM00001c8d
-        onu: SCOM00001c8d
-        olt: 722033738988
-        c_tag: 222
-        s_tag: 22
-        power_switch_port: 4
-        uni_id: 1
-      -
-        ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.333
-        container_type: LXC
-        container_name: SCOM00019ab7
-        onu: SCOM00019ab7
-        olt: 722033738988
-        c_tag: 333
-        s_tag: 33
-        power_switch_port: 8
-        uni_id: 1
-
-      # 1600X OLT
-      -
-        ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.88
-        container_type: LXC
-        container_name: SCOMa0108adf
-        onu: SCOMa0108adf
-        olt: 722033038194
-        c_tag: 88
-        s_tag: 89
-        power_switch_port: 7
-        uni_id: 1
-
-    dst:
-      # 3200G OLT
-      -
-        dp_iface_ip_qinq: 10.11.11.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-
-      - dp_iface_ip_qinq: 10.54.41.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-
-      - dp_iface_ip_qinq: 10.55.42.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-
-      #1600G OLT
-      -
-        dp_iface_ip_qinq: 10.22.22.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-      -
-        dp_iface_ip_qinq: 10.33.33.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-      # 1600X OLT
-      -
-        dp_iface_ip_qinq: 10.89.88.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-
-  web_power_switch:
-    ip: '10.90.0.250'
-    user: 'cord'
-    password: 'cord'
-    type: 'DLI'