diff --git a/deployment-configs/flex-ocp-cord.yml b/deployment-configs/flex-ocp-cord.yml
new file mode 100644
index 0000000..9d37407
--- /dev/null
+++ b/deployment-configs/flex-ocp-cord.yml
@@ -0,0 +1,37 @@
+# Copyright 2017-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 Flex OCP POD 1
+
+---
+
+kube_config: 'flex-ocp-cord.conf'
+
+nodes:
+  -
+    ip: '10.192.20.41'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.42'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.43'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.44'
+    user: 'cord'
+    pass: 'cord'
diff --git a/deployment-configs/flex-ocp-mcord.yml b/deployment-configs/flex-ocp-mcord.yml
new file mode 100644
index 0000000..7a70a10
--- /dev/null
+++ b/deployment-configs/flex-ocp-mcord.yml
@@ -0,0 +1,23 @@
+# Copyright 2017-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.
+
+# MAAS System information for Flex OCP MCORD Server
+
+---
+
+maas:
+  ip: '10.192.18.200'
+  api_key: 'MjANS9eByptLAWXVNU:pwuet4hrWkznmYmueF:hDgm7vnvLbfFCkNcAsS6j7Ezkwu9B5Ts'
+  head_system_id: 'rrwkmn'
+
diff --git a/deployment-configs/flex-ocp-pod2.yml b/deployment-configs/flex-ocp-pod2.yml
new file mode 100644
index 0000000..9d37407
--- /dev/null
+++ b/deployment-configs/flex-ocp-pod2.yml
@@ -0,0 +1,37 @@
+# Copyright 2017-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 Flex OCP POD 1
+
+---
+
+kube_config: 'flex-ocp-cord.conf'
+
+nodes:
+  -
+    ip: '10.192.20.41'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.42'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.43'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.44'
+    user: 'cord'
+    pass: 'cord'
diff --git a/deployment-configs/flex-onf-pod1.yml b/deployment-configs/flex-onf-pod1.yml
new file mode 100644
index 0000000..638b954
--- /dev/null
+++ b/deployment-configs/flex-onf-pod1.yml
@@ -0,0 +1,33 @@
+# Copyright 2017-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 Flex ONF POD 1
+
+---
+
+kube_config: 'flex-onf-pod1.conf'
+
+nodes:
+  -
+    ip: '10.192.22.61'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.22.62'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.22.63'
+    user: 'cord'
+    pass: 'cord'
diff --git a/deployment-configs/flex-pod1-olt.yml b/deployment-configs/flex-pod1-olt.yml
new file mode 100644
index 0000000..8d40c7f
--- /dev/null
+++ b/deployment-configs/flex-pod1-olt.yml
@@ -0,0 +1,50 @@
+# Copyright 2017-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 Flex POD 1 , olt/onu are connected to this
+
+---
+
+kube_config: 'flex-pod1-olt.conf'
+
+nodes:
+  -
+    ip: '10.192.4.241'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.4.242'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.4.243'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.4.244'
+    user: 'cord'
+    pass: 'cord'
+
+srcHost:
+  ip: '10.192.4.61'
+  user: 'cluser'
+  pass: 'cloudlabs'
+  gateway: '10.8.2.254'
+
+dstHost:
+  ip: '10.192.4.62'
+  hostIp: '10.8.3.100'
+  user: 'cord'
+  pass: 'cord'
+  gateway: '10.8.3.254'
diff --git a/deployment-configs/flex-pod1.yml b/deployment-configs/flex-pod1.yml
deleted file mode 100644
index a7e0adf..0000000
--- a/deployment-configs/flex-pod1.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2017-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 Flex POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'flex-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.192.4.61'
-  api_key: 'rsz9S2cYpr7M5w4SfL:gyw4vKqLpWwagSjFGg:pamj7QtqGC6eUZusMj6rCWRdNy9qPab7'
-  head_system_id: 'wbgst6'
-
-dev_node:
-  name: 'flex-cord-pod1'
-  user: 'cluser'
-
-head:
-  ip: '10.192.4.62'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.192.4.31'
-      user: 'ADMIN'
-      pass: 'ADMIN'
-  -
-    ipmi:
-      ip: '10.192.4.30'
-      user: 'ADMIN'
-      pass: 'ADMIN'
-  -
-    ipmi:
-      ip: '10.192.4.29'
-      user: 'ADMIN'
-      pass: 'ADMIN'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:d9:38:6d'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: 'cc:37:ab:b6:b5:64'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
-  -
-    mac: 'cc:37:ab:d9:37:69'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
diff --git a/deployment-configs/flex-pod2.yml b/deployment-configs/flex-pod2.yml
deleted file mode 100644
index d3e4651..0000000
--- a/deployment-configs/flex-pod2.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2017-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 Flex POD 2
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'flex-pod2.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.192.20.61'
-  api_key: 'un9j4NkrTdtx6F7W3K:rP2gBaJvEPvjsc6qxX:zRxDNFVGVynVuVS93XbjxFh2DmCC8Zun'
-  head_system_id: 'ttawhe'
-
-dev_node:
-  name: 'flex-cord-pod2'
-  user: 'cluser'
-
-head:
-  ip: '10.192.20.62'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.192.20.35'
-      user: 'OCPM'
-      pass: 'OCPM'
-  -
-    ipmi:
-      ip: '10.192.20.36'
-      user: 'OCPM'
-      pass: 'OCPM'
-  -
-    ipmi:
-      ip: '10.192.20.37'
-      user: 'OCPM'
-      pass: 'OCPM'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:7c:b4:68'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: '70:72:cf:df:f4:7e'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
-  -
-    mac: 'cc:37:ab:97:13:27'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: 'cc:37:ab:7c:b4:1e'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
diff --git a/deployment-configs/onf-abc.yml b/deployment-configs/onf-abc.yml
deleted file mode 100644
index 4875d73..0000000
--- a/deployment-configs/onf-abc.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2017-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 ONF/ABC physical POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onf-abc.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.255.21.1'
-  api_key: '3LKARGmAUQ8Rp7jJBU:5V7gkLUDvEEktBZnYh:TxLSprnNcgLmQAZQLm63Mv5Va7vhvSFT'
-  head_system_id: '4fe84k'
-
-dev_node:
-  name: 'ONF - ABC'
-  user: 'cord'
-
-head:
-  ip: '10.255.21.2'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.255.21.203'
-      user: 'root'
-      pass: 'Google321'
-  -
-    ipmi:
-      ip: '10.255.21.204'
-      user: 'root'
-      pass: 'Google321'
-  -
-    ipmi:
-      ip: '10.255.21.205'
-      user: 'root'
-      pass: 'Google321'
-
-fabric_switches:
-  -
-    mac: 'a8:2b:b5:d2:a6:78'
-    ip: '10.255.20.201'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: 'a8:2b:b5:bd:13:a7'
-    ip: '10.255.20.202'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: 'a8:2b:b5:9d:cd:73'
-    ip: '10.255.20.203'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
-  -
-    mac: 'a8:2b:b5:bd:15:ad'
-    ip: '10.255.20.204'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
diff --git a/deployment-configs/onlab-ecord-global.yml b/deployment-configs/onlab-ecord-global.yml
deleted file mode 100644
index 48067c8..0000000
--- a/deployment-configs/onlab-ecord-global.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Copyright 2017-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 E-CORD global node deployment configuration for ONF E-CORD POD 
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-ecord-global.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.90.0.2'
-  api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
-  head_system_id: '4y3h86'
-
-dev_node:
-  name: 'onf-build'
-  user: 'ubuntu'
-
-head:
-  ip: '10.90.1.10'
-  user: 'cord'
-  pass: 'cord'
diff --git a/deployment-configs/onlab-ecord-local-pod1.yml b/deployment-configs/onlab-ecord-local-pod1.yml
deleted file mode 100644
index 0473cd9..0000000
--- a/deployment-configs/onlab-ecord-local-pod1.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2017-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 E-CORD local node deployment configuration for ONF local POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-ecord-local-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.90.0.2'
-  api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
-  head_system_id: '4y3h87'
-
-dev_node:
-  name: 'onf-build'
-  user: 'ubuntu'
-
-head:
-  ip: '10.90.1.30'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.90.1.32'
-      user: 'admin'
-      pass: 'admin'
-fabric_switches:
-  -
-    mac: 'cc:37:ab:7c:bd:64'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    breakout_ports:
-        - 2
diff --git a/deployment-configs/onlab-ecord-local-pod2.yml b/deployment-configs/onlab-ecord-local-pod2.yml
deleted file mode 100644
index 65f1668..0000000
--- a/deployment-configs/onlab-ecord-local-pod2.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2017-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 E-CORD local node deployment configuration for ONF E-CORD local POD 2
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-ecord-local-pod2.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.90.0.2'
-  api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
-  head_system_id: '4y3h88'
-
-dev_node:
-  name: 'onf-build'
-  user: 'ubuntu'
-
-head:
-  ip: '10.90.1.50'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.90.1.52'
-      user: 'admin'
-      pass: 'admin'
-fabric_switches:
-  -
-    mac: 'cc:37:ab:7c:c2:fa'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    breakout_ports:
-        - 2
diff --git a/deployment-configs/onlab-ecord-local-pod3.yml b/deployment-configs/onlab-ecord-local-pod3.yml
deleted file mode 100644
index d595234..0000000
--- a/deployment-configs/onlab-ecord-local-pod3.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2017-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 E-CORD local node deployment configuration for ONF local POD 3
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-ecord-local-pod3.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.90.0.2'
-  api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
-  head_system_id: '4y3h8a'
-
-dev_node:
-  name: 'onf-build'
-  user: 'ubuntu'
-
-head:
-  ip: '10.90.1.70'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.90.1.72'
-      user: 'admin'
-      pass: 'admin'
-fabric_switches:
-  -
-    mac: 'cc:37:ab:7c:bc:60'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    breakout_ports:
-        - 2
diff --git a/deployment-configs/onlab-mcord-cavium-pod1.yml b/deployment-configs/onlab-mcord-cavium-pod1.yml
deleted file mode 100644
index fd13cc5..0000000
--- a/deployment-configs/onlab-mcord-cavium-pod1.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2017-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 ONF/ON.Lab physical POD 1 -- Cavium scenario on Master branch
-# This file is for M-CORD 5.0
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-mcord-cavium-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.90.0.2'
-  api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
-  head_system_id: '4y3h8b'
-
-dev_node:
-  name: 'onf-mcord-dev'
-  user: 'cord'
-
-head:
-  ip: '10.90.2.10'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.90.2.12'
-      user: 'admin'
-      pass: 'admin'
-  -
-    ipmi:
-      ip: '10.90.2.13'
-      user: 'admin'
-      pass: 'admin'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:7c:b8:50'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: 'cc:37:ab:5b:6d:26'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
-  -
-    mac: 'cc:37:ab:6b:07:8e'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-    breakout_ports:
-        - 9
-  -
-    mac: '48:0f:cf:ae:7e:90'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
-    breakout_ports:
-        - 9
diff --git a/deployment-configs/onlab-mcord-p4-pod1.yml b/deployment-configs/onlab-mcord-p4-pod1.yml
deleted file mode 100644
index d0dde22..0000000
--- a/deployment-configs/onlab-mcord-p4-pod1.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2017-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 ONF/ON.Lab physical POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-mcord-p4-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.92.0.10'
-  api_key: '4AZntjAPJmN6xCdyh3:RU4aMndpdCrWLpEv3W:QbjPXNe3Pkf8EL62FCutRwn2MdVt9BJa'
-  head_system_id: '6b87hb'
-
-dev_node:
-  name: 'onf-mcord-p4'
-  user: 'ubuntu'
-
-head:
-  ip: '10.92.0.20'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.92.0.41'
-      user: 'admin'
-      pass: 'admin'
-      mac: 'a4:bf:01:04:38:58'
-  -
-    ipmi:
-      ip: '10.92.0.51'
-      user: 'admin'
-      pass: 'admin'
-      mac: 'a4:bf:01:04:8c:65'
-
-# P4 HW switch deployment stuff
-fabric_switches_bmc:
-  -
-    mac: 'A8:2B:B5:3C:DB:40'
-    ip: '10.6.0.111'
-    user: 'root'
-    pass: '0penBmc'
-    role: 'leaf-1-bmc'
-  -
-    mac: 'A8:2B:B5:3C:BD:F0'
-    ip: '10.6.0.112'
-    user: 'root'
-    pass: '0penBmc'
-    role: 'leaf-2-bmc'
-  -
-    mac: '8C:EA:1B:E4:96:71'
-    ip: '10.6.0.121'
-    user: 'root'
-    pass: '0penBmc'
-    role: 'spine-1-bmc'
-  -
-    mac: '8C:EA:1B:E4:8C:0D'
-    ip: '10.6.0.122'
-    user: 'root'
-    pass: '0penBmc'
-    role: 'spine-2-bmc'
-
-fabric_switches:
-  -
-    mac: '00:90:fb:5d:9d:15'
-    ip: '10.6.0.211'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: '00:90:fb:5e:48:9a'
-    ip: '10.6.0.212'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
-  -
-    mac: '00:90:fb:5c:e1:a6'
-    ip: '10.6.0.221'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: '00:90:fb:5c:e1:97'
-    ip: '10.6.0.222'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
-  -
-    mac: '24:8a:07:12:51:00'
-    ip: '10.6.0.231'
-    user: 'root'
-    pass: 'root'
-    role: 'spine-1-mellanox'
-  -
-    mac: '8c:ea:1b:10:c1:e8'
-    ip: '10.6.0.241'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1-cavium'
-  -
-    mac: 'cc:37:ab:bf:a6:e5'
-    ip: '10.6.0.242'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2-cavium'
diff --git a/deployment-configs/onlab-mcord-pod1.yml b/deployment-configs/onlab-mcord-pod1.yml
deleted file mode 100644
index fc03d68..0000000
--- a/deployment-configs/onlab-mcord-pod1.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2017-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 ONF/ON.Lab physical POD 1
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'onlab-mcord-pod1.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.90.0.2'
-  api_key: 'gFH8GA9FLp3bWpesZX:rVyJz3ThB93FrrNyPw:Fu9KZEwBenXRLUu9TMXVkMjLJsuXNXDb'
-  head_system_id: '4y3h8b'
-
-dev_node:
-  name: 'onf-mcord-dev'
-  user: 'cord'
-
-head:
-  ip: '10.90.2.10'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.90.2.12'
-      user: 'admin'
-      pass: 'admin'
-  -
-    ipmi:
-      ip: '10.90.2.13'
-      user: 'admin'
-      pass: 'admin'
-
-fabric_switches:
-  -
-    mac: 'cc:37:ab:7c:b8:50'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: 'cc:37:ab:5b:6d:26'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
-  -
-    mac: 'cc:37:ab:6b:07:8e'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-    breakout_ports:
-        - 9
-  -
-    mac: '48:0f:cf:ae:7e:90'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
-    breakout_ports:
-        - 9
diff --git a/deployment-configs/qct-pod1.yml b/deployment-configs/qct-pod1.yml
index f265907..4c3d0ae 100644
--- a/deployment-configs/qct-pod1.yml
+++ b/deployment-configs/qct-pod1.yml
@@ -16,60 +16,18 @@
 
 ---
 
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod1.yml'
+kube_config: 'qct-pod1.conf'
 
-make_release: 'true'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'ehm46m'
-
-dev_node:
-  name: 'qct-cord-pod1'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.11'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
+nodes:
   -
-    ipmi:
-      ip: '10.201.101.13'
-      user: 'OCPQ'
-      pass: 'OCPQ'
+    ip: '10.201.101.11'
+    user: 'cord'
+    pass: 'cord'
   -
-    ipmi:
-      ip: '10.201.101.14'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-
-fabric_switches:
+    ip: '10.201.101.12'
+    user: 'cord'
+    pass: 'cord'
   -
-    mac: '48:0f:cf:ae:de:26'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-1'
-  -
-    mac: '48:0f:cf:ae:cc:24'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-1'
-  -
-    mac: '48:0f:cf:ae:ee:2a'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-    role: 'leaf-2'
-  -
-    mac: '48:0f:cf:ae:9d:58'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
-    role: 'spine-2'
+    ip: '10.201.101.13'
+    user: 'cord'
+    pass: 'cord'
diff --git a/deployment-configs/qct-pod2-dpdk.yml b/deployment-configs/qct-pod2-dpdk.yml
deleted file mode 100644
index 22d8480..0000000
--- a/deployment-configs/qct-pod2-dpdk.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017-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 QCT POD 2
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod2-dpdk.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'bqqqkm'
-
-dev_node:
-  name: 'qct-cord-pod2'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.21'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.201.101.23'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-  -
-    ipmi:
-      ip: '10.201.101.24'
-      user: 'OCPQ'
-      pass: 'OCPQ'
diff --git a/deployment-configs/qct-pod2.yml b/deployment-configs/qct-pod2.yml
deleted file mode 100644
index f6da5f8..0000000
--- a/deployment-configs/qct-pod2.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2017-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 QCT POD 2
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod2.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'tffdpw'
-
-dev_node:
-  name: 'qct-cord-pod2'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.21'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.201.101.23'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-  -
-    ipmi:
-      ip: '10.201.101.24'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-
-fabric_switches:
-  -
-    mac: '54:ab:3a:76:6f:ab'
-    ip: '10.6.0.101'
-    user: 'root'
-    pass: 'onl'
-  -
-    mac: '54:ab:3a:76:7d:04'
-    ip: '10.6.0.102'
-    user: 'root'
-    pass: 'onl'
-  -
-    mac: '54:ab:3a:76:7d:cd'
-    ip: '10.6.0.103'
-    user: 'root'
-    pass: 'onl'
-  -
-    mac: '54:ab:3a:76:89:0e'
-    ip: '10.6.0.104'
-    user: 'root'
-    pass: 'onl'
diff --git a/deployment-configs/qct-pod3-ecord-global.yml b/deployment-configs/qct-pod3-ecord-global.yml
deleted file mode 100644
index 756dc6b..0000000
--- a/deployment-configs/qct-pod3-ecord-global.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017-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 E-CORD global node deployment configuration for QCT POD 3
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod3-ecord-global.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'amnpa7'
-
-dev_node:
-  name: 'qct-cord-pod3'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.31'
-  user: 'cord'
-  pass: 'cord'
diff --git a/deployment-configs/qct-pod3-ecord-local.yml b/deployment-configs/qct-pod3-ecord-local.yml
deleted file mode 100644
index 208efce..0000000
--- a/deployment-configs/qct-pod3-ecord-local.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017-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 E-CORD local node deployment configuration for QCT POD 3
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod3-ecord-local.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'amnpa7'
-
-dev_node:
-  name: 'qct-cord-pod3'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.31'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.201.101.33'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-  -
-    ipmi:
-      ip: '10.201.101.34'
-      user: 'OCPQ'
-      pass: 'OCPQ'
diff --git a/deployment-configs/qct-pod3.yml b/deployment-configs/qct-pod3.yml
deleted file mode 100644
index 13048c8..0000000
--- a/deployment-configs/qct-pod3.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017-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 QCT POD 3
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod3.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'amnpa7'
-
-dev_node:
-  name: 'qct-cord-pod3'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.31'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.201.101.33'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-  -
-    ipmi:
-      ip: '10.201.101.34'
-      user: 'OCPQ'
-      pass: 'OCPQ'
diff --git a/deployment-configs/qct-pod4-mcord.yml b/deployment-configs/qct-pod4-mcord.yml
deleted file mode 100644
index 541f0f4..0000000
--- a/deployment-configs/qct-pod4-mcord.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2017-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 M-CORD deployment configuration for QCT POD 4
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod4-mcord.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'b43ra7'
-
-dev_node:
-  name: 'qct-cord-pod4'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.41'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.201.101.43'
-      user: 'OCPQ'
-      pass: 'OCPQ'
diff --git a/deployment-configs/qct-pod4.yml b/deployment-configs/qct-pod4.yml
deleted file mode 100644
index ebe61cc..0000000
--- a/deployment-configs/qct-pod4.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017-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 QCT POD 4
-
----
-
-pod_config:
-  repo_url: 'https://gerrit.opencord.org/pod-configs'
-  file_name: 'qct-pod4.yml'
-
-make_release: 'false'
-
-maas:
-  ip: '10.201.101.254'
-  api_key: 'fQp2rrr3RqZtkJJYBK:XqQX7UqwXGKMYQ8EZ5:UDbFhfenPdjc3fmmCQX2fek7AyRGrf6A'
-  head_system_id: 'b43ra7'
-
-dev_node:
-  name: 'qct-cord-pod4'
-  user: 'cord'
-
-head:
-  ip: '10.201.101.41'
-  user: 'cord'
-  pass: 'cord'
-
-compute_nodes:
-  -
-    ipmi:
-      ip: '10.201.101.43'
-      user: 'OCPQ'
-      pass: 'OCPQ'
-  -
-    ipmi:
-      ip: '10.201.101.44'
-      user: 'OCPQ'
-      pass: 'OCPQ'