diff --git a/apps/whoami/deployment.yaml b/apps/podinfo/deployment.yaml
similarity index 100%
rename from apps/whoami/deployment.yaml
rename to apps/podinfo/deployment.yaml
diff --git a/apps/whoami/ingress.yaml b/apps/podinfo/ingress.yaml
similarity index 100%
rename from apps/whoami/ingress.yaml
rename to apps/podinfo/ingress.yaml
diff --git a/apps/whoami/kustomization.yaml b/apps/podinfo/kustomization.yaml
similarity index 100%
rename from apps/whoami/kustomization.yaml
rename to apps/podinfo/kustomization.yaml
diff --git a/apps/whoami/service.yaml b/apps/podinfo/service.yaml
similarity index 100%
rename from apps/whoami/service.yaml
rename to apps/podinfo/service.yaml
diff --git a/clusters/kairos/apps-kustomization.yaml b/clusters/kairos/apps/fluxrepo.yaml
similarity index 79%
rename from clusters/kairos/apps-kustomization.yaml
rename to clusters/kairos/apps/fluxrepo.yaml
index 57c5f2c..c59ebcc 100644
--- a/clusters/kairos/apps-kustomization.yaml
+++ b/clusters/kairos/apps/fluxrepo.yaml
@@ -2,11 +2,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: flux-apps
-  namespace: flux-system
+  namespace: apps
 spec:
   interval: 10m0s
   path: ./apps
   prune: true
   sourceRef:
     kind: GitRepository
-    name: flux-system
+    name: apps
diff --git a/apps/kustomization.yaml b/clusters/kairos/apps/kustomization.yaml
similarity index 87%
rename from apps/kustomization.yaml
rename to clusters/kairos/apps/kustomization.yaml
index 295fd6e..3ccd6fd 100644
--- a/apps/kustomization.yaml
+++ b/clusters/kairos/apps/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Kustomization
 namespace: apps
 resources:
 - namespace.yaml
-- whoami
\ No newline at end of file
+- fluxrepo.yaml
\ No newline at end of file
diff --git a/apps/namespace.yaml b/clusters/kairos/apps/namespace.yaml
similarity index 100%
rename from apps/namespace.yaml
rename to clusters/kairos/apps/namespace.yaml