diff --git a/comac/sample/kubespray-inventory/extra-vars.yaml b/comac/sample/central/extra-vars.yaml
similarity index 100%
rename from comac/sample/kubespray-inventory/extra-vars.yaml
rename to comac/sample/central/extra-vars.yaml
diff --git a/comac/sample/kubespray-inventory/group_vars b/comac/sample/central/group_vars
similarity index 100%
rename from comac/sample/kubespray-inventory/group_vars
rename to comac/sample/central/group_vars
diff --git a/comac/sample/central/hosts.ini b/comac/sample/central/hosts.ini
new file mode 100644
index 0000000..8884dd6
--- /dev/null
+++ b/comac/sample/central/hosts.ini
@@ -0,0 +1,38 @@
+# Copyright 2019-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.
+
+[all]
+central1 ansible_host=10.90.0.131 etcd_member_name=etcd1
+central2 ansible_host=10.90.0.132
+
+[kube-master]
+central1
+
+[etcd]
+central1
+
+[kube-node]
+central1
+central2
+
+[k8s-cluster:children]
+kube-master
+kube-node
+
+[omec-cp]
+central1
+central2
+
+[omec-cp:vars]
+node_labels={"omec-cp":"enabled"}
diff --git a/comac/sample/kubespray-inventory/extra-vars.yaml b/comac/sample/edge/extra-vars.yaml
similarity index 100%
copy from comac/sample/kubespray-inventory/extra-vars.yaml
copy to comac/sample/edge/extra-vars.yaml
diff --git a/comac/sample/kubespray-inventory/group_vars b/comac/sample/edge/group_vars
similarity index 100%
copy from comac/sample/kubespray-inventory/group_vars
copy to comac/sample/edge/group_vars
diff --git a/comac/sample/edge/hosts.ini b/comac/sample/edge/hosts.ini
new file mode 100644
index 0000000..affd36b
--- /dev/null
+++ b/comac/sample/edge/hosts.ini
@@ -0,0 +1,49 @@
+# Copyright 2019-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.
+
+[all]
+edge1 ansible_host=192.168.87.151 etcd_member_name=etcd1
+edge2 ansible_host=192.168.87.152 etcd_member_name=etcd2
+edge3 ansible_host=192.168.87.153 etcd_member_name=etcd3
+
+[kube-master]
+edge1
+edge2
+edge3
+
+[etcd]
+edge1
+edge2
+edge3
+
+[kube-node]
+edge1
+edge2
+edge3
+
+[k8s-cluster:children]
+kube-master
+kube-node
+
+[omec-dp]
+edge3
+
+[omec-dp:vars]
+node_labels={"omec-dp":"enabled"}
+
+[cdn-local]
+edge2
+
+[cdn-local:vars]
+node_labels={"cdn-local":"enabled"}
diff --git a/comac/sample/omec-override-values-multi.yaml b/comac/sample/omec-override-values-multi.yaml
index 64316f5..fdaa37a 100644
--- a/comac/sample/omec-override-values-multi.yaml
+++ b/comac/sample/omec-override-values-multi.yaml
@@ -23,11 +23,6 @@
       vfio:
         pfNames:
           - eth2
-      netDevice:
-        pfNames:
-          - eth2
-        drivers:
-          - ixgbevf
   mme:
     cfgFiles:
       config.json:
@@ -60,7 +55,7 @@
           unreachability: 1
   spgwu:
     cpComm:
-      addr: 192.168.171.3
+      addr: 10.90.0.131
       port: 30021
     dpComm:
       nodePort:
@@ -72,7 +67,7 @@
         enabled: true
         port: 30021
     dpComm:
-      addr: 192.168.170.3
+      addr: 192.168.87.151
       port: 30020
     cfgFiles:
       adc_rules.cfg: |
@@ -419,9 +414,9 @@
 
 # CDN local values
 remote_streaming:
-  antmedia_ip: 192.168.171.3
+  antmedia_ip: 10.90.0.131
   video_quality: 360
 stream_name: 360
 
 # CDN remote values
-remote_ip: 192.168.171.3
+remote_ip: 10.90.0.131
diff --git a/comac/sample/omec-override-values.yaml b/comac/sample/omec-override-values.yaml
index 6fa7e9d..3c6e88e 100644
--- a/comac/sample/omec-override-values.yaml
+++ b/comac/sample/omec-override-values.yaml
@@ -23,11 +23,6 @@
       vfio:
         pfNames:
           - eth2
-      netDevice:
-        pfNames:
-          - eth2
-        drivers:
-          - ixgbevf
   mme:
     cfgFiles:
       config.json:
@@ -404,9 +399,9 @@
 
 # CDN local values
 remote_streaming:
-  antmedia_ip: 192.168.171.3
+  antmedia_ip: 10.90.0.131
   video_quality: 360
 stream_name: 360
 
 # CDN remote values
-remote_ip: 192.168.171.3
+remote_ip: 10.90.0.131
diff --git a/comac/sample/kubespray-inventory/extra-vars.yaml b/comac/sample/single/extra-vars.yaml
similarity index 100%
copy from comac/sample/kubespray-inventory/extra-vars.yaml
copy to comac/sample/single/extra-vars.yaml
diff --git a/comac/sample/kubespray-inventory/group_vars b/comac/sample/single/group_vars
similarity index 100%
copy from comac/sample/kubespray-inventory/group_vars
copy to comac/sample/single/group_vars
diff --git a/comac/sample/kubespray-inventory/hosts.ini b/comac/sample/single/hosts.ini
similarity index 100%
rename from comac/sample/kubespray-inventory/hosts.ini
rename to comac/sample/single/hosts.ini