diff --git a/comac/cluster-api/gcp/kustomization.yaml b/comac/cluster-api/gcp/kustomization.yaml
new file mode 100644
index 0000000..a1f9d12
--- /dev/null
+++ b/comac/cluster-api/gcp/kustomization.yaml
@@ -0,0 +1,21 @@
+# 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.
+
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+  - https://github.com/kubernetes-sigs/cluster-api-provider-gcp/examples/controlplane
+patchesStrategicMerge:
+  - kustomizecomac.yaml
diff --git a/comac/cluster-api/gcp/kustomizecomac.yaml b/comac/cluster-api/gcp/kustomizecomac.yaml
new file mode 100644
index 0000000..05b3ac9
--- /dev/null
+++ b/comac/cluster-api/gcp/kustomizecomac.yaml
@@ -0,0 +1,56 @@
+# 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.
+
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2
+kind: KubeadmConfig
+metadata:
+  name: ${CLUSTER_NAME}-controlplane-0
+spec:
+  clusterConfiguration:
+    apiServer:
+      extraArgs:
+        feature-gates: SCTPSupport=True
+        service-node-port-range: 2000-36767
+    scheduler:
+      extraArgs:
+        feature-gates: SCTPSupport=True
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2
+kind: KubeadmConfig
+metadata:
+  name: ${CLUSTER_NAME}-controlplane-1
+spec:
+  clusterConfiguration:
+    apiServer:
+      extraArgs:
+        feature-gates: SCTPSupport=True
+        service-node-port-range: 2000-36767
+    scheduler:
+      extraArgs:
+        feature-gates: SCTPSupport=True
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2
+kind: KubeadmConfig
+metadata:
+  name: ${CLUSTER_NAME}-controlplane-2
+spec:
+  clusterConfiguration:
+    apiServer:
+      extraArgs:
+        feature-gates: SCTPSupport=True
+        service-node-port-range: 2000-36767
+    scheduler:
+      extraArgs:
+        feature-gates: SCTPSupport=True
diff --git a/comac/sample/kubespray-inventories/edge/extra-vars.yaml b/comac/kubespray/extra-vars.yaml
similarity index 100%
rename from comac/sample/kubespray-inventories/edge/extra-vars.yaml
rename to comac/kubespray/extra-vars.yaml
diff --git a/comac/sample/kubespray-inventories/central/group_vars b/comac/kubespray/inventories/central/group_vars
similarity index 100%
rename from comac/sample/kubespray-inventories/central/group_vars
rename to comac/kubespray/inventories/central/group_vars
diff --git a/comac/sample/kubespray-inventories/central/hosts.ini b/comac/kubespray/inventories/central/hosts.ini
similarity index 100%
rename from comac/sample/kubespray-inventories/central/hosts.ini
rename to comac/kubespray/inventories/central/hosts.ini
diff --git a/comac/sample/kubespray-inventories/edge/group_vars b/comac/kubespray/inventories/edge/group_vars
similarity index 100%
rename from comac/sample/kubespray-inventories/edge/group_vars
rename to comac/kubespray/inventories/edge/group_vars
diff --git a/comac/sample/kubespray-inventories/edge/hosts.ini b/comac/kubespray/inventories/edge/hosts.ini
similarity index 100%
rename from comac/sample/kubespray-inventories/edge/hosts.ini
rename to comac/kubespray/inventories/edge/hosts.ini
diff --git a/comac/sample/kubespray-inventories/single/group_vars b/comac/kubespray/inventories/single/group_vars
similarity index 100%
rename from comac/sample/kubespray-inventories/single/group_vars
rename to comac/kubespray/inventories/single/group_vars
diff --git a/comac/sample/kubespray-inventories/single/hosts.ini b/comac/kubespray/inventories/single/hosts.ini
similarity index 100%
rename from comac/sample/kubespray-inventories/single/hosts.ini
rename to comac/kubespray/inventories/single/hosts.ini
diff --git a/comac/sample/override-values-multi.yaml b/comac/override-values/override-values-multi.yaml
similarity index 100%
rename from comac/sample/override-values-multi.yaml
rename to comac/override-values/override-values-multi.yaml
diff --git a/comac/sample/override-values-single.yaml b/comac/override-values/override-values-single.yaml
similarity index 100%
rename from comac/sample/override-values-single.yaml
rename to comac/override-values/override-values-single.yaml
diff --git a/comac/sample/kubespray-inventories/central/extra-vars.yaml b/comac/sample/kubespray-inventories/central/extra-vars.yaml
deleted file mode 100644
index b67911b..0000000
--- a/comac/sample/kubespray-inventories/central/extra-vars.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.
-
-# Sample kubespray override variables for COMAC deploy.
-# Pass this file as an extra variables when running kubespray. For example,
-# ansible-playbook -b -i inventory/comac/hosts.ini -e @inventory/comac/extra-vars.yaml cluster.yml
-# Tested with Kubespray release-2.11
-
-# OS
-disable_swap: true
-populate_inventory_to_hosts_file: true
-
-# etcd
-etcd_deployment_type: docker
-etcd_memory_limit: 8192M
-
-# Docker
-docker_iptables_enabled: true
-
-# K8S
-kubeadm_enabled: true
-kubelet_deployment_type: host
-kubectl_localhost: true
-kubeconfig_localhost: true
-
-kube_feature_gates: [SCTPSupport=True]
-kube_pods_subnet: 172.18.0.0/17
-kube_service_addresses: 172.18.128.0/17
-kube_apiserver_node_port_range: 2000-36767
-kube_network_plugin: calico
-kube_network_plugin_multus: true
-multus_version: stable
-ipip: false
-
-local_volume_provisioner_enabled: true
-
-# Applications
-dns_mode: coredns
-dns_cores_per_replica: 256
-dns_min_replicas: 1
-
-helm_enabled: true
-helm_deployment_type: host
-helm_version: v2.15.0
diff --git a/comac/sample/kubespray-inventories/single/extra-vars.yaml b/comac/sample/kubespray-inventories/single/extra-vars.yaml
deleted file mode 100644
index b67911b..0000000
--- a/comac/sample/kubespray-inventories/single/extra-vars.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.
-
-# Sample kubespray override variables for COMAC deploy.
-# Pass this file as an extra variables when running kubespray. For example,
-# ansible-playbook -b -i inventory/comac/hosts.ini -e @inventory/comac/extra-vars.yaml cluster.yml
-# Tested with Kubespray release-2.11
-
-# OS
-disable_swap: true
-populate_inventory_to_hosts_file: true
-
-# etcd
-etcd_deployment_type: docker
-etcd_memory_limit: 8192M
-
-# Docker
-docker_iptables_enabled: true
-
-# K8S
-kubeadm_enabled: true
-kubelet_deployment_type: host
-kubectl_localhost: true
-kubeconfig_localhost: true
-
-kube_feature_gates: [SCTPSupport=True]
-kube_pods_subnet: 172.18.0.0/17
-kube_service_addresses: 172.18.128.0/17
-kube_apiserver_node_port_range: 2000-36767
-kube_network_plugin: calico
-kube_network_plugin_multus: true
-multus_version: stable
-ipip: false
-
-local_volume_provisioner_enabled: true
-
-# Applications
-dns_mode: coredns
-dns_cores_per_replica: 256
-dns_min_replicas: 1
-
-helm_enabled: true
-helm_deployment_type: host
-helm_version: v2.15.0