diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index 2b3195b..54f7388 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -56,7 +56,7 @@
       fortygig: False
       aggPort: 2
       serial: EC1912001814
-      oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
+      oltDebVersion: openolt_asgvolt64-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-100G-NNI.deb
       board_technology: GPON
  
   hosts:
diff --git a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
index 5d5b042..53f60c4 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
@@ -56,7 +56,7 @@
       fortygig: False
       aggPort: 2
       serial: EC1912001814
-      oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
+      oltDebVersion: openolt_asgvolt64-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-100G-NNI.deb
       board_technology: GPON
 
   # XGS-PON OLT
@@ -68,7 +68,7 @@
       fortygig: False
       aggPort: 1
       serial: EC1729003539
-      oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
+      oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-100G-NNI.deb
       board_technology: XGS-PON
 
   hosts:
diff --git a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
index 2b3195b..54f7388 100644
--- a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
@@ -56,7 +56,7 @@
       fortygig: False
       aggPort: 2
       serial: EC1912001814
-      oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
+      oltDebVersion: openolt_asgvolt64-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-100G-NNI.deb
       board_technology: GPON
  
   hosts:
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index f36efe4..c26872f 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -56,7 +56,7 @@
     fortygig: False
     aggPort: 1
     serial: 'EC1729003539'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-100G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-100G-NNI.deb
     board_technology: XGS-PON
 
 
diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 167b5ba..7c7da9e 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -50,7 +50,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
diff --git a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
index ada550b..18db802 100644
--- a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
@@ -50,7 +50,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 3c5f723..56332fe 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -50,7 +50,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
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..ea03039
--- /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: 2
+      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-gpon-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
similarity index 67%
rename from deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
rename to deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
index 25e6977..51022f7 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
@@ -52,17 +52,7 @@
       fortygig: True
       aggPort: 1
       serial: 722033538840
-      oltDebVersion: openolt_rlt-3200g-w-40g-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4.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.0-dev-4525f70fb6438ec5a3a1004fcfd82fbe7fb7cc57.deb
+      oltDebVersion: openolt_rlt-3200g-w-40g-3.5.1-dev-262b6293cdeda78317dda9d3a6cfab0e7ebfbf05.deb
       board_technology: GPON
 
   hosts:
@@ -108,34 +98,6 @@
         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
-
     dst:
       # 3200G OLT
       -
@@ -178,34 +140,6 @@
         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
-
   web_power_switch:
     ip: '10.90.0.250'
     user: 'cord'
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
index 065a798..90aa3de 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
@@ -52,7 +52,7 @@
       fortygig: True
       aggPort: 1
       serial: 722033538840
-      oltDebVersion: openolt_rlt-3200g-w-40g-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4.deb
+      oltDebVersion: openolt_rlt-3200g-w-40g-3.5.1-dev-262b6293cdeda78317dda9d3a6cfab0e7ebfbf05.deb
       board_technology: GPON
 
   hosts:
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index dd521b4..7ede458 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -51,7 +51,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
@@ -66,9 +66,9 @@
       ip: '10.128.100.72'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.11'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.11'
+      container_type: LXC
+      container_name: ISKT71e80080
       onu: 'ISKT71e80080'
       olt: 'EC1904000654'
       c_tag: '11'
@@ -80,9 +80,9 @@
       ip: '10.128.100.71'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.22'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.22'
+      container_type: LXC
+      container_name: ALPHe3d1cf9d
       onu: 'ALPHe3d1cf9d'
       olt: 'EC1904000654'
       c_tag: '22'
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 5023d8b..5c1d52c 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -50,7 +50,7 @@
       fortygig: True
       aggPort: 9
       serial: EC1912001818
-      oltDebVersion: openolt_asgvolt64-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+      oltDebVersion: openolt_asgvolt64-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
       board_technology: GPON
 
   hosts:
diff --git a/deployment-configs/onf-demo-pod-openonugo-DT.yaml b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
index 48af6d8..ca43744 100644
--- a/deployment-configs/onf-demo-pod-openonugo-DT.yaml
+++ b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
@@ -51,7 +51,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
@@ -66,9 +66,9 @@
       ip: '10.128.100.72'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.11'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.11'
+      container_type: LXC
+      container_name: ISKT71e80080
       onu: 'ISKT71e80080'
       olt: 'EC1904000654'
       c_tag: '11'
@@ -79,9 +79,9 @@
       ip: '10.128.100.71'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0.22'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1.22'
+      container_type: LXC
+      container_name: ALPHe3d1cf9d
       onu: 'ALPHe3d1cf9d'
       olt: 'EC1904000654'
       c_tag: '22'
diff --git a/deployment-configs/onf-demo-pod-openonugo.yaml b/deployment-configs/onf-demo-pod-openonugo.yaml
index 6a03bc4..5c35f28 100644
--- a/deployment-configs/onf-demo-pod-openonugo.yaml
+++ b/deployment-configs/onf-demo-pod-openonugo.yaml
@@ -51,7 +51,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
@@ -66,9 +66,9 @@
       ip: '10.128.100.72'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ISKT71e80080
       onu: 'ISKT71e80080'
       olt: 'EC1904000654'
       c_tag: '11'
@@ -80,9 +80,9 @@
       ip: '10.128.100.71'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ALPHe3d1cf9d
       onu: 'ALPHe3d1cf9d'
       olt: 'EC1904000654'
       c_tag: '22'
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 6a03bc4..5c35f28 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -51,7 +51,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
@@ -66,9 +66,9 @@
       ip: '10.128.100.72'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ISKT71e80080
       onu: 'ISKT71e80080'
       olt: 'EC1904000654'
       c_tag: '11'
@@ -80,9 +80,9 @@
       ip: '10.128.100.71'
       user: 'cord'
       pass: 'cord'
-      dp_iface_name: 'ens255f0'
-      container_type: null
-      container_name: null
+      dp_iface_name: 'eth1'
+      container_type: LXC
+      container_name: ALPHe3d1cf9d
       onu: 'ALPHe3d1cf9d'
       olt: 'EC1904000654'
       c_tag: '22'
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 81190f4..0772b8e 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -47,7 +47,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1721000208'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     oltPort: '9191'
     board_technology: XGS-PON
 
diff --git a/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index 7d402be..916154f 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -42,7 +42,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1721000208'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index 7d402be..916154f 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -42,7 +42,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1721000208'
-    oltDebVersion: openolt_asfvolt16-3.4.8-eec0fc9e9a01dc0d35b0b8441e0a22a4c0cc51b4-40G-NNI.deb
+    oltDebVersion: openolt_asfvolt16-3.5.1-b8c09facd3da5d93b7c2815e176c6682de737437-40G-NNI.deb
     board_technology: XGS-PON
 
 onus:
diff --git a/kubernetes-configs/menlo-certification-pod-radisys-gpon.conf b/kubernetes-configs/menlo-certification-pod-radisys-1600g.conf
similarity index 100%
rename from kubernetes-configs/menlo-certification-pod-radisys-gpon.conf
rename to kubernetes-configs/menlo-certification-pod-radisys-1600g.conf
diff --git a/kubernetes-configs/menlo-certification-pod-radisys-gpon.conf b/kubernetes-configs/menlo-certification-pod-radisys-1600x.conf
similarity index 100%
copy from kubernetes-configs/menlo-certification-pod-radisys-gpon.conf
copy to kubernetes-configs/menlo-certification-pod-radisys-1600x.conf
diff --git a/kubernetes-configs/menlo-certification-pod-radisys-gpon.conf b/kubernetes-configs/menlo-certification-pod-radisys-3200g.conf
similarity index 100%
copy from kubernetes-configs/menlo-certification-pod-radisys-gpon.conf
copy to kubernetes-configs/menlo-certification-pod-radisys-3200g.conf
diff --git a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml b/kubernetes-configs/voltha/menlo-certification-pod-radisys-1600g.yml
similarity index 100%
rename from kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
rename to kubernetes-configs/voltha/menlo-certification-pod-radisys-1600g.yml
diff --git a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml b/kubernetes-configs/voltha/menlo-certification-pod-radisys-1600x.yml
similarity index 100%
copy from kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
copy to kubernetes-configs/voltha/menlo-certification-pod-radisys-1600x.yml
diff --git a/kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml b/kubernetes-configs/voltha/menlo-certification-pod-radisys-3200g.yml
similarity index 100%
copy from kubernetes-configs/voltha/menlo-certification-pod-radisys-gpon.yml
copy to kubernetes-configs/voltha/menlo-certification-pod-radisys-3200g.yml
diff --git a/tosca-configs/voltha/menlo-certification-pod-radisys-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/menlo-certification-pod-radisys-1600g-onos-netcfg-switch.json
similarity index 100%
rename from tosca-configs/voltha/menlo-certification-pod-radisys-gpon-onos-netcfg-switch.json
rename to tosca-configs/voltha/menlo-certification-pod-radisys-1600g-onos-netcfg-switch.json
diff --git a/tosca-configs/voltha/menlo-certification-pod-radisys-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/menlo-certification-pod-radisys-1600x-onos-netcfg-switch.json
similarity index 100%
copy from tosca-configs/voltha/menlo-certification-pod-radisys-gpon-onos-netcfg-switch.json
copy to tosca-configs/voltha/menlo-certification-pod-radisys-1600x-onos-netcfg-switch.json
diff --git a/tosca-configs/voltha/menlo-certification-pod-radisys-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/menlo-certification-pod-radisys-3200g-onos-netcfg-switch.json
similarity index 100%
copy from tosca-configs/voltha/menlo-certification-pod-radisys-gpon-onos-netcfg-switch.json
copy to tosca-configs/voltha/menlo-certification-pod-radisys-3200g-onos-netcfg-switch.json