diff --git a/instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml b/instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml
new file mode 100644
index 00000000..5fafb351
--- /dev/null
+++ b/instance-applications/130-ibm-mas-suite/templates/07-non-shared-cluster-addon.yaml
@@ -0,0 +1,21 @@
+---
+{{- if (eq .Values.non_shared_cluster_addon_enabled "true") }}
+apiVersion: addons.mas.ibm.com/v1
+kind: GenericAddon
+metadata:
+  name: "{{ .Values.instance_id }}-addons-non-shared-cluster"
+  annotations:
+    argocd.argoproj.io/sync-wave: "134" # CRD is in ibm-mas operator
+  labels:
+    mas.ibm.com/configScope: system # correct ???
+    mas.ibm.com/instanceId: {{ .Values.instance_id }}
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  displayName: Non-Shared Cluster
+  addonType: non-shared-cluster
+  config:
+    instances:
+      - name: {{ MAS Application ID }} # TODO what goes here?
+{{- end }}
diff --git a/instance-applications/130-ibm-mas-suite/values.yaml b/instance-applications/130-ibm-mas-suite/values.yaml
index bd32ab88..39e19584 100644
--- a/instance-applications/130-ibm-mas-suite/values.yaml
+++ b/instance-applications/130-ibm-mas-suite/values.yaml
@@ -1,3 +1,4 @@
 ---
 instance_id: xxx
 ibm_entitlement_key: xxxx
+non_shared_cluster_addon_enabled: "false"
diff --git a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml
index 1d654766..608713bb 100644
--- a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml
@@ -42,6 +42,7 @@ spec:
             region_id: "{{ .Values.region.id }}"
             cluster_id: "{{ .Values.cluster.id }}"
             instance_id: "{{ .Values.instance.id }}"
+            non_shared_cluster_addon_enabled: "{{ .Values.cluster.is_non_shared_cluster }}"
             sm_aws_access_key_id: "{{ .Values.sm.aws_access_key_id }}"
             sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}"
             sm_aws_region: "{{ .Values.region.id }}"