diff --git a/instance-applications/550-ibm-mas-addons-config/templates/06-nonshared-cluster-cr.yaml b/instance-applications/550-ibm-mas-addons-config/templates/06-nonshared-cluster-cr.yaml
index a493fd57e..3f775416d 100644
--- a/instance-applications/550-ibm-mas-addons-config/templates/06-nonshared-cluster-cr.yaml
+++ b/instance-applications/550-ibm-mas-addons-config/templates/06-nonshared-cluster-cr.yaml
@@ -1,5 +1,6 @@
 {{- if .Values.application_admin_role }}
 {{- if eq .Values.cluster_nonshared true }}
+{{- if ne .Values.operational_mode "nonproduction" }}
 ---
 apiVersion: addons.mas.ibm.com/v1
 kind: GenericAddon
@@ -21,4 +22,4 @@ spec:
     addonIdentifier: {{ .Values.cluster_id }}
     instances:
       - name: "{{ .Values.instance_id }}-NonsharedCluster"
-{{- end }}{{- end }}
+{{- end }}{{- end }}{{- end }}
diff --git a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml
index e5d9611a9..cb179a9c1 100644
--- a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml
@@ -55,6 +55,13 @@ spec:
             additional_vpn: {{ .Values.additional_vpn }}
             cluster_nonshared: {{ .Values.cluster_nonshared }}
             application_configuration: {{ .Values.application_configuration }}
+            {{- if .Values.ibm_mas_suite }}
+            {{- if .Values.ibm_mas_suite.mas_annotations }}
+            {{- if (index .Values.ibm_mas_suite.mas_annotations "mas.ibm.com/operationalMode") }}
+            operational_mode: {{ index .Values.ibm_mas_suite.mas_annotations "mas.ibm.com/operationalMode" }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
             use_postdelete_hooks: {{ .Values.use_postdelete_hooks | default true }}
             {{- if .Values.additional_resources }}
             additional_resources: {{ .Values.additional_resources | toYaml | nindent 14 }}