diff --git a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml
index d7afb9691..aedaeb3ce 100644
--- a/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml
+++ b/instance-applications/130-ibm-jdbc-config/templates/00-presync-create-db2-rds-user-Job.yaml
@@ -273,7 +273,7 @@ spec:
             # 1. Admin users: We CREATE these with DBADM (for schema management)
             
             # Validate MAS_APP_ID
-            valid_apps = ['manage', 'facilities', 'iot']
+            valid_apps = ['manage', 'facilities', 'iot', 'monitor']
             if mas_app_id not in valid_apps:
                 print(f"Unknown MAS_APP_ID: {mas_app_id}")
                 sys.exit(1)
diff --git a/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml
index a5b94ecfc..96cd59975 100644
--- a/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml
@@ -16,7 +16,11 @@ metadata:
     {{- else if eq $value.mas_app_id "facilities" }}
     argocd.argoproj.io/sync-wave: "510"
     {{- else if eq $value.mas_app_id "iot" }}
+    {{- if and $.Values.ibm_suite_app_iot_install (regexMatch "^9\\.(2|[3-9]|[1-9][0-9])\\..*" $.Values.ibm_suite_app_iot_install.mas_app_channel) }}
+    argocd.argoproj.io/sync-wave: "530"
+    {{- else }}
     argocd.argoproj.io/sync-wave: "515"
+    {{- end }}
     {{- else if eq $value.mas_app_id "manage" }}
     argocd.argoproj.io/sync-wave: "510"
     {{- else if eq $value.mas_app_id "visualinspection" }}
@@ -24,7 +28,11 @@ metadata:
     {{- else if eq $value.mas_app_id "health" }}
     argocd.argoproj.io/sync-wave: "530"
     {{- else if eq $value.mas_app_id "monitor" }}
+    {{- if and $.Values.ibm_suite_app_monitor_install (regexMatch "^9\\.(2|[3-9]|[1-9][0-9])\\..*" $.Values.ibm_suite_app_monitor_install.mas_app_channel) }}
+    argocd.argoproj.io/sync-wave: "515"
+    {{- else }}
     argocd.argoproj.io/sync-wave: "530"
+    {{- end }}
     {{- else if eq $value.mas_app_id "optimizer" }}
     argocd.argoproj.io/sync-wave: "530"
     {{- else if eq $value.mas_app_id "predict" }}
diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml
index 6bbd856b1..bf50815b7 100644
--- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml
@@ -13,7 +13,7 @@ metadata:
     instance: '{{ .Values.instance.id }}'
     masapp: 'iot'
   annotations:
-    argocd.argoproj.io/sync-wave: "510"
+    argocd.argoproj.io/sync-wave: "{{- if .Values.ibm_suite_app_iot_install.mas_app_channel }}{{- $channel := .Values.ibm_suite_app_iot_install.mas_app_channel | toString }}{{- $version := regexFind `^[0-9]+\.[0-9]+` $channel }}{{- if $version }}{{- $parts := splitList "." $version }}{{- $major := index $parts 0 | int }}{{- $minor := index $parts 1 | int }}{{- if or (gt $major 9) (and (eq $major 9) (ge $minor 2)) }}520{{- else }}510{{- end }}{{- else }}510{{- end }}{{- else }}510{{- end }}"
     {{- if and .Values.notifications .Values.notifications.slack_channel_id }}
     notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }}
     notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }}
diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml
index b5c7b5ed4..8f9f37bba 100644
--- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml
+++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml
@@ -13,7 +13,7 @@ metadata:
     instance: '{{ .Values.instance.id }}'
     masapp: 'monitor'
   annotations:
-    argocd.argoproj.io/sync-wave: "520"
+    argocd.argoproj.io/sync-wave: "{{- if .Values.ibm_suite_app_monitor_install.mas_app_channel }}{{- $channel := .Values.ibm_suite_app_monitor_install.mas_app_channel | toString }}{{- $version := regexFind `^[0-9]+\.[0-9]+` $channel }}{{- if $version }}{{- $parts := splitList "." $version }}{{- $major := index $parts 0 | int }}{{- $minor := index $parts 1 | int }}{{- if or (gt $major 9) (and (eq $major 9) (ge $minor 2)) }}510{{- else }}520{{- end }}{{- else }}520{{- end }}{{- else }}520{{- end }}"
     {{- if and .Values.notifications .Values.notifications.slack_channel_id }}
     notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }}
     notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }}