diff --git a/traefik/base/001-cluster-role.yaml b/traefik/base/000-cluster-role.yaml
similarity index 100%
rename from traefik/base/001-cluster-role.yaml
rename to traefik/base/000-cluster-role.yaml
diff --git a/traefik/base/000-namespace.yaml b/traefik/base/000-namespace.yaml
deleted file mode 100644
index c088a91..0000000
--- a/traefik/base/000-namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: traefik
diff --git a/traefik/base/001-role-binding.yaml b/traefik/base/000-role-binding.yaml
similarity index 91%
rename from traefik/base/001-role-binding.yaml
rename to traefik/base/000-role-binding.yaml
index ea193bb..fa6c088 100644
--- a/traefik/base/001-role-binding.yaml
+++ b/traefik/base/000-role-binding.yaml
@@ -10,4 +10,3 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: traefik-account
-    namespace: traefik
diff --git a/traefik/base/002-service-account.yaml b/traefik/base/001-service-account.yaml
similarity index 100%
rename from traefik/base/002-service-account.yaml
rename to traefik/base/001-service-account.yaml
diff --git a/traefik/base/002-traefik-services.yaml b/traefik/base/002-traefik-services.yaml
new file mode 100644
index 0000000..2327d04
--- /dev/null
+++ b/traefik/base/002-traefik-services.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: traefik-service
+
+spec:
+  type: LoadBalancer
+  ports:
+    - targetPort: web
+      port: 80
+    - targetPort: dashboard
+      port: 8080
+  selector:
+    app: traefik
diff --git a/traefik/base/003-traefik.yaml b/traefik/base/002-traefik.yaml
similarity index 100%
rename from traefik/base/003-traefik.yaml
rename to traefik/base/002-traefik.yaml
diff --git a/traefik/base/003-traefik-services.yaml b/traefik/base/003-traefik-services.yaml
deleted file mode 100644
index f4b644f..0000000
--- a/traefik/base/003-traefik-services.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: traefik-dashboard-service
-  namespace: traefik
-
-spec:
-  type: LoadBalancer
-  ports:
-    - port: 8080
-      targetPort: dashboard
-  selector:
-    app: traefik
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: traefik-web-service
-  namespace: traefik
-
-spec:
-  type: LoadBalancer
-  ports:
-    - targetPort: web
-      port: 80
-  selector:
-    app: traefik
diff --git a/whoami/whoami-deployment.yaml b/whoami/base/whoami-deployment.yaml
similarity index 100%
rename from whoami/whoami-deployment.yaml
rename to whoami/base/whoami-deployment.yaml
diff --git a/whoami/whoami-ingress.yaml b/whoami/base/whoami-ingress.yaml
similarity index 92%
rename from whoami/whoami-ingress.yaml
rename to whoami/base/whoami-ingress.yaml
index 2ddd2ea..a386e1c 100644
--- a/whoami/whoami-ingress.yaml
+++ b/whoami/base/whoami-ingress.yaml
@@ -2,7 +2,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: whoami-ingress
-  namespace: traefik
 spec:
   rules:
   - http:
diff --git a/whoami/whoami-namespace.yaml b/whoami/base/whoami-namespace.yaml
similarity index 100%
rename from whoami/whoami-namespace.yaml
rename to whoami/base/whoami-namespace.yaml
diff --git a/whoami/whoami-svc.yaml b/whoami/base/whoami-svc.yaml
similarity index 100%
rename from whoami/whoami-svc.yaml
rename to whoami/base/whoami-svc.yaml
diff --git a/whoami/kustomization.yaml b/whoami/kustomization.yaml
new file mode 100644
index 0000000..69038cd
--- /dev/null
+++ b/whoami/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: whoami
+
+resources:
+- ./base/namespace.yaml
+- ./base/whoami-deployment.yaml
+- ./base/whoami-svc.yaml.yaml
+- ./base/whoami-ingress.yaml