diff --git a/.gitignore b/.gitignore
index b2fad50..255335d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,4 @@
 helm-repo-tools/*
 
 # ignore dependent chart dirs
-xos-core/charts
-voltha/charts
-xos-core/charts
-nem-monitoring/charts/
-xos-profiles/*/charts
-workflows/*/charts
-storage/*/charts
-logging/charts
+charts
diff --git a/comac/Chart.yaml b/comac/Chart.yaml
new file mode 100644
index 0000000..8b6c3a8
--- /dev/null
+++ b/comac/Chart.yaml
@@ -0,0 +1,19 @@
+# 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: v1
+name: comac
+description: An umbrella Helm chart for deploying COMAC on CORD platform
+icon: https://guide.opencord.org/logos/cord.svg
+version: 1.0.0
diff --git a/comac/requirements.yaml b/comac/requirements.yaml
new file mode 100644
index 0000000..5446e09
--- /dev/null
+++ b/comac/requirements.yaml
@@ -0,0 +1,31 @@
+# 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.
+
+dependencies:
+- name: base-kubernetes
+  version: 1.2.1
+  repository: https://charts.opencord.org
+- name: mcord-services
+  version: 1.1.8
+  repository: https://charts.opencord.org
+  condition: mcord-services.enabled
+- name: seba-services
+  version: 1.2.8
+  repository: https://charts.opencord.org
+  condition: seba-services.enabled
+- name: onos
+  version: 1.1.3
+  repository: https://charts.opencord.org
+  condition: mcord-services.progran.enabled
+  alias: onos-progran
diff --git a/comac/templates/.gitignore b/comac/templates/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/comac/templates/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/comac/values.yaml b/comac/values.yaml
new file mode 100644
index 0000000..e1cf63d
--- /dev/null
+++ b/comac/values.yaml
@@ -0,0 +1,80 @@
+# 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.
+
+onos-progran:
+  nameOverride: "onos-progran"
+  images:
+    onos:
+      repository: 'omecproject/onos-progran'
+      tag: '1.0.0'
+  services:
+    openflow:
+      nodePort: 31654
+    ssh:
+      nodePort: 30116
+    ui:
+      nodePort: 30121
+    debugger:
+      nodePort: 30556
+    progran:
+      type: NodePort
+      port: 4010
+      nodePort: 30410
+
+mcord-services:
+  enabled: true
+  onosFabricRestService: "cord-platform-onos-ui.default.svc.cluster.local"
+  onosProgranRestService: "comac-onos-progran-ui.default.svc.cluster.local"
+  progran:
+    image:
+      repository: 'omecproject/progran-synchronizer'
+      tag: 'comac-1.0.0'
+      pullPolicy: 'IfNotPresent'
+    onosProgranRestService: "comac-onos-progran-ui.default.svc.cluster.local"
+  mcord-subscriber:
+    image:
+      repository: 'omecproject/mcord-synchronizer'
+      tag: 'comac-1.0.0'
+      pullPolicy: 'IfNotPresent'
+  onos-service:
+    kafkaService: "cord-platform-kafka"
+    onosRestService: "cord-platform-onos-cord-ui.default.svc.cluster.local"
+    enabled: true
+
+seba-services:
+  enabled: false
+  # Disable onos-service and fabric from SEBA to avoid conflict with MCORD services
+  # Note that Helm 2.15 or higher is required for nested dependency configs work properly
+  onos-service:
+    enabled: false
+  fabric:
+    enabled: false
+
+  onosRestService: "cord-platform-onos-ui.default.svc.cluster.local"
+  kafkaService: "cord-platform-kafka.default.svc.cluster.local:9092"
+  volt:
+    kafkaService: "cord-platform-kafka"
+    volthaRestService: "voltha.voltha.svc.cluster.local"
+    onosRestService: "cord-platform-onos-ui.default.svc.cluster.local"
+  fabric-crossconnect:
+    kafkaService: "cord-platform-kafka"
+  sadis-server:
+    kafkaBroker: "cord-platform-kafka:9092"
+
+base-kubernetes:
+  kubernetes:
+    image:
+      repository: 'omecproject/kubernetes-synchronizer'
+      tag: 'comac-1.0.0'
+      pullPolicy: 'IfNotPresent'