diff --git a/infrastructure/templates/microcks.yaml b/infrastructure/templates/microcks.yaml
index 8979ffb..6c36113 100644
--- a/infrastructure/templates/microcks.yaml
+++ b/infrastructure/templates/microcks.yaml
@@ -1,14 +1,3 @@
-apiVersion: operators.coreos.com/v1
-kind: OperatorGroup
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: "10"
-  name: microcks
-  namespace: {{ .Values.projectName | quote }}
-spec:
-  targetNamespaces:
-  - {{ .Values.projectName | quote }}
----
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
diff --git a/infrastructure/templates/project.yaml b/infrastructure/templates/project.yaml
index d59ca00..3106007 100644
--- a/infrastructure/templates/project.yaml
+++ b/infrastructure/templates/project.yaml
@@ -10,3 +10,14 @@ metadata:
 spec:
   finalizers:
   - kubernetes
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "5"
+  name: {{ .Values.projectName | quote }}
+  namespace: {{ .Values.projectName | quote }}
+spec:
+  targetNamespaces:
+  - {{ .Values.projectName | quote }}
diff --git a/infrastructure/templates/sso.yaml b/infrastructure/templates/sso.yaml
index fde6e0c..2a42566 100644
--- a/infrastructure/templates/sso.yaml
+++ b/infrastructure/templates/sso.yaml
@@ -1,14 +1,3 @@
-apiVersion: operators.coreos.com/v1
-kind: OperatorGroup
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: "10"
-  name: sso
-  namespace: {{ .Values.projectName | quote }}
-spec:
-  targetNamespaces:
-  - {{ .Values.projectName | quote }}
----
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata: