diff --git a/bases/.empty b/bases/.empty
new file mode 100644
index 0000000..e69de29
diff --git a/bases/common/cert-manager/kustomization.yaml b/bases/common/cert-manager/kustomization.yaml
deleted file mode 100644
index b938020..0000000
--- a/bases/common/cert-manager/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - cert-manager-app.yaml
diff --git a/bases/common/contour/kustomization.yaml b/bases/common/contour/kustomization.yaml
deleted file mode 100644
index 3e34212..0000000
--- a/bases/common/contour/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - contour-app.yaml
diff --git a/bases/common/rook/kustomization.yaml b/bases/common/rook/kustomization.yaml
deleted file mode 100644
index e4f8949..0000000
--- a/bases/common/rook/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - rook-app.yaml
diff --git a/common.yml b/common.yml
index ad0485a..77d4073 100644
--- a/common.yml
+++ b/common.yml
@@ -13,3 +13,6 @@ spec:
     repoURL: https://github.com/ClubCedille/k8s-base
     path: common
     targetRevision: HEAD
+    directory:
+      recurse: true
+      include: "{*.argoapp.yaml,*.argoapp.yml}"
diff --git a/bases/common/cert-manager/cert-manager-app.yaml b/common/cert-manager/cert-manager.argoapp.yaml
similarity index 100%
rename from bases/common/cert-manager/cert-manager-app.yaml
rename to common/cert-manager/cert-manager.argoapp.yaml
diff --git a/bases/common/cert-manager/helm/cert-manager-values.yaml b/common/cert-manager/helm/cert-manager-values.yaml
similarity index 99%
rename from bases/common/cert-manager/helm/cert-manager-values.yaml
rename to common/cert-manager/helm/cert-manager-values.yaml
index 59ae75e..e8751d2 100644
--- a/bases/common/cert-manager/helm/cert-manager-values.yaml
+++ b/common/cert-manager/helm/cert-manager-values.yaml
@@ -741,10 +741,10 @@ webhook:
     # +docs:property
     namespaceSelector:
       matchExpressions:
-        - key: "cert-manager.io/disable-validation"
-          operator: "NotIn"
-          values:
-            - "true"
+      - key: "cert-manager.io/disable-validation"
+        operator: "NotIn"
+        values:
+        - "true"
 
   mutatingWebhookConfiguration:
     # Configure spec.namespaceSelector for mutating webhooks.
diff --git a/bases/common/cert-manager/issuers/issuer-prod.yaml b/common/cert-manager/issuers/issuer-prod.yaml
similarity index 100%
rename from bases/common/cert-manager/issuers/issuer-prod.yaml
rename to common/cert-manager/issuers/issuer-prod.yaml
diff --git a/bases/common/cert-manager/issuers/issuer-staging.yaml b/common/cert-manager/issuers/issuer-staging.yaml
similarity index 100%
rename from bases/common/cert-manager/issuers/issuer-staging.yaml
rename to common/cert-manager/issuers/issuer-staging.yaml
diff --git a/bases/common/contour/contour-app.yaml b/common/contour/contour.argoapp.yaml
similarity index 100%
rename from bases/common/contour/contour-app.yaml
rename to common/contour/contour.argoapp.yaml
diff --git a/bases/common/kustomization.yaml b/common/kustomization.yaml
similarity index 100%
rename from bases/common/kustomization.yaml
rename to common/kustomization.yaml
diff --git a/bases/common/rook/ressources/cluster-external.yaml b/common/rook/ressources/cluster-external.yaml
similarity index 100%
rename from bases/common/rook/ressources/cluster-external.yaml
rename to common/rook/ressources/cluster-external.yaml
diff --git a/bases/common/rook/ressources/common-external.yaml b/common/rook/ressources/common-external.yaml
similarity index 100%
rename from bases/common/rook/ressources/common-external.yaml
rename to common/rook/ressources/common-external.yaml
diff --git a/bases/common/rook/ressources/common.yaml b/common/rook/ressources/common.yaml
similarity index 100%
rename from bases/common/rook/ressources/common.yaml
rename to common/rook/ressources/common.yaml
diff --git a/bases/common/rook/ressources/crds.yaml b/common/rook/ressources/crds.yaml
similarity index 100%
rename from bases/common/rook/ressources/crds.yaml
rename to common/rook/ressources/crds.yaml
diff --git a/bases/common/rook/ressources/operator.yaml b/common/rook/ressources/operator.yaml
similarity index 100%
rename from bases/common/rook/ressources/operator.yaml
rename to common/rook/ressources/operator.yaml
diff --git a/bases/common/rook/rook-app.yaml b/common/rook/rook.argoapp.yaml
similarity index 100%
rename from bases/common/rook/rook-app.yaml
rename to common/rook/rook.argoapp.yaml