diff --git a/kubernetes/aks/apps/webtop/base/kustomization.yaml b/kubernetes/aks/apps/webtop/base/kustomization.yaml
index 4316b2e0..82ec38e1 100644
--- a/kubernetes/aks/apps/webtop/base/kustomization.yaml
+++ b/kubernetes/aks/apps/webtop/base/kustomization.yaml
@@ -3,38 +3,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - andjeutcha/andjeutcha-webtop-deployment.yaml
-  - andjeutcha/andjeutcha-webtop-ingress.yaml
-  - andjeutcha/andjeutcha-webtop-secrets.yaml
-
-  - gallagbe/gallagbe-webtop-deployment.yaml
-  - gallagbe/gallagbe-webtop-ingress.yaml
-  - gallagbe/gallagbe-webtop-secrets.yaml
-
-  - jbarbier/jbarbier-webtop-deployment.yaml
-  - jbarbier/jbarbier-webtop-ingress.yaml
-  - jbarbier/jbarbier-webtop-secrets.yaml
-
-  - jsantos/jsantos-webtop-deployment.yaml
-  - jsantos/jsantos-webtop-ingress.yaml
-  - jsantos/jsantos-webtop-secrets.yaml
-
-  - jtalbi/jtalbi-webtop-deployment.yaml
-  - jtalbi/jtalbi-webtop-ingress.yaml
-  - jtalbi/jtalbi-webtop-secrets.yaml
-
-  - spevraire/spevraire-webtop-deployment.yaml
-  - spevraire/spevraire-webtop-ingress.yaml
-  - spevraire/spevraire-webtop-secrets.yaml
-
-  - stavakoli/stavakoli-webtop-deployment.yaml
-  - stavakoli/stavakoli-webtop-ingress.yaml
-  - stavakoli/stavakoli-webtop-secrets.yaml
-
-  - tcardin/tcardin-webtop-deployment.yaml
-  - tcardin/tcardin-webtop-ingress.yaml
-  - tcardin/tcardin-webtop-secrets.yaml
-
-  - wlemire/wlemire-webtop-deployment.yaml
-  - wlemire/wlemire-webtop-ingress.yaml
-  - wlemire/wlemire-webtop-secrets.yaml
+  - ../users/andjeutcha/
+  - ../users/gallagbe/
+  - ../users/jbarbier/
+  - ../users/jsantos/
+  - ../users/jtalbi/
+  - ../users/spevraire/
+  - ../users/stavakoli/
+  - ../users/tcardin/
+  - ../users/wlemire/
diff --git a/kubernetes/aks/apps/webtop/base/andjeutcha/andjeutcha-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/andjeutcha/andjeutcha-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/andjeutcha/andjeutcha-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/andjeutcha/andjeutcha-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/andjeutcha/andjeutcha-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/andjeutcha/andjeutcha-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/andjeutcha/andjeutcha-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/andjeutcha/andjeutcha-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/andjeutcha/andjeutcha-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/andjeutcha/andjeutcha-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/andjeutcha/andjeutcha-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/andjeutcha/andjeutcha-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/gallagbe/gallagbe-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/gallagbe/gallagbe-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/gallagbe/gallagbe-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/gallagbe/gallagbe-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/gallagbe/gallagbe-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/gallagbe/gallagbe-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/gallagbe/gallagbe-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/gallagbe/gallagbe-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/gallagbe/gallagbe-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/gallagbe/gallagbe-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/gallagbe/gallagbe-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/gallagbe/gallagbe-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jbarbier/jbarbier-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/jbarbier/jbarbier-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jbarbier/jbarbier-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/jbarbier/jbarbier-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jbarbier/jbarbier-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/jbarbier/jbarbier-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jbarbier/jbarbier-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/jbarbier/jbarbier-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jbarbier/jbarbier-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/jbarbier/jbarbier-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jbarbier/jbarbier-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/jbarbier/jbarbier-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jsantos/jsantos-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/jsantos/jsantos-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jsantos/jsantos-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/jsantos/jsantos-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jsantos/jsantos-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/jsantos/jsantos-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jsantos/jsantos-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/jsantos/jsantos-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jsantos/jsantos-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/jsantos/jsantos-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jsantos/jsantos-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/jsantos/jsantos-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jtalbi/jtalbi-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/jtalbi/jtalbi-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jtalbi/jtalbi-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/jtalbi/jtalbi-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jtalbi/jtalbi-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/jtalbi/jtalbi-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jtalbi/jtalbi-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/jtalbi/jtalbi-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/jtalbi/jtalbi-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/jtalbi/jtalbi-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/jtalbi/jtalbi-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/jtalbi/jtalbi-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/spevraire/spevraire-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/spevraire/spevraire-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/spevraire/spevraire-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/spevraire/spevraire-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/spevraire/spevraire-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/spevraire/spevraire-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/spevraire/spevraire-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/spevraire/spevraire-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/spevraire/spevraire-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/spevraire/spevraire-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/spevraire/spevraire-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/spevraire/spevraire-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/stavakoli/stavakoli-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/stavakoli/stavakoli-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/stavakoli/stavakoli-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/stavakoli/stavakoli-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/stavakoli/stavakoli-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/stavakoli/stavakoli-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/stavakoli/stavakoli-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/stavakoli/stavakoli-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/stavakoli/stavakoli-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/stavakoli/stavakoli-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/stavakoli/stavakoli-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/stavakoli/stavakoli-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/tcardin/tcardin-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/tcardin/tcardin-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/tcardin/tcardin-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/tcardin/tcardin-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/tcardin/tcardin-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/tcardin/tcardin-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/tcardin/tcardin-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/tcardin/tcardin-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/tcardin/tcardin-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/tcardin/tcardin-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/tcardin/tcardin-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/tcardin/tcardin-webtop-secrets.yaml
diff --git a/kubernetes/aks/apps/webtop/base/wlemire/wlemire-webtop-deployment.yaml b/kubernetes/aks/apps/webtop/users/wlemire/wlemire-webtop-deployment.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/wlemire/wlemire-webtop-deployment.yaml
rename to kubernetes/aks/apps/webtop/users/wlemire/wlemire-webtop-deployment.yaml
diff --git a/kubernetes/aks/apps/webtop/base/wlemire/wlemire-webtop-ingress.yaml b/kubernetes/aks/apps/webtop/users/wlemire/wlemire-webtop-ingress.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/wlemire/wlemire-webtop-ingress.yaml
rename to kubernetes/aks/apps/webtop/users/wlemire/wlemire-webtop-ingress.yaml
diff --git a/kubernetes/aks/apps/webtop/base/wlemire/wlemire-webtop-secrets.yaml b/kubernetes/aks/apps/webtop/users/wlemire/wlemire-webtop-secrets.yaml
similarity index 100%
rename from kubernetes/aks/apps/webtop/base/wlemire/wlemire-webtop-secrets.yaml
rename to kubernetes/aks/apps/webtop/users/wlemire/wlemire-webtop-secrets.yaml