diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
index 82dc07bf639b7819ce7a81825cafdda08a611f25..c94b45ade3e5656cffbda4c8361ae112a2122aff 100644
--- a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+++ b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
@@ -100,11 +100,6 @@ spec:
       namespace: {{ .Release.Namespace }}
     {{- end }}
 
-    {{- if .Values.monitoring.enabled }}
-    - name: monitoring
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-
     {{- with .Values.addons.mattermost.objectStorage }}
     {{- if not (and .endpoint .accessKey .accessSecret .bucket) }}
     - name: minio-operator
diff --git a/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml b/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
index f479fc830cf77003d4dff19064b33ca6c095a5be..39570ff191e3b3d5cf49e9c1f76f5aef98db3932 100644
--- a/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
+++ b/chart/templates/mattermost/operator/mattermost-operator-helmrelease.yaml
@@ -44,4 +44,16 @@ spec:
   values:
     imagePullSecrets:
       - name: private-registry
+
+  {{- if or .Values.gatekeeper.enabled .Values.monitoring.enabled }}
+  dependsOn:
+    {{- if .Values.gatekeeper.enabled }}
+    - name: gatekeeper
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+  {{- end }}
 {{- end }}