diff --git a/kubernetes/apps/system-upgrade/kustomization.yaml b/kubernetes/apps/system-upgrade/kustomization.yaml
index e374d5f..8e7b9e5 100644
--- a/kubernetes/apps/system-upgrade/kustomization.yaml
+++ b/kubernetes/apps/system-upgrade/kustomization.yaml
@@ -1,8 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: system-upgrade
 
 resources:
   - ./namespace.yaml
-  - ./tuppr
+  - ./tuppr/ks.yaml
diff --git a/kubernetes/apps/system-upgrade/tuppr/app.ks.yaml b/kubernetes/apps/system-upgrade/tuppr/ks.yaml
similarity index 53%
rename from kubernetes/apps/system-upgrade/tuppr/app.ks.yaml
rename to kubernetes/apps/system-upgrade/tuppr/ks.yaml
index b65375b..429bbc3 100644
--- a/kubernetes/apps/system-upgrade/tuppr/app.ks.yaml
+++ b/kubernetes/apps/system-upgrade/tuppr/ks.yaml
@@ -5,6 +5,7 @@ kind: Kustomization
 metadata:
   name: tuppr
 spec:
+  path: "./kubernetes/apps/system-upgrade/tuppr/app"
   commonMetadata:
     labels:
       app.kubernetes.io/name: tuppr
@@ -13,11 +14,32 @@ spec:
       kind: HelmRelease
       name: tuppr
       namespace: system-upgrade
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
   interval: 1h
-  path: "./kubernetes/apps/system-upgrade/tuppr/app"
+  timeout: 5m
+
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/refs/heads/main/kustomization-kustomize-v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: tuppr-upgrades
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: tuppr
+  dependsOn:
+    - name: tuppr
+  interval: 1h
+  path: "./kubernetes/apps/system-upgrade/tuppr/upgrades"
   prune: true
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
   timeout: 5m
+  wait: false
\ No newline at end of file
diff --git a/kubernetes/apps/system-upgrade/tuppr/kustomization.yaml b/kubernetes/apps/system-upgrade/tuppr/kustomization.yaml
deleted file mode 100644
index 64a32fe..0000000
--- a/kubernetes/apps/system-upgrade/tuppr/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - ./app.ks.yaml
-  - ./upgrades.ks.yaml
\ No newline at end of file
diff --git a/kubernetes/apps/system-upgrade/tuppr/upgrades.ks.yaml b/kubernetes/apps/system-upgrade/tuppr/upgrades.ks.yaml
deleted file mode 100644
index 8138ca9..0000000
--- a/kubernetes/apps/system-upgrade/tuppr/upgrades.ks.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/refs/heads/main/kustomization-kustomize-v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: tuppr-upgrades
-spec:
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: tuppr
-  dependsOn:
-    - name: tuppr
-  interval: 1h
-  path: "./kubernetes/apps/system-upgrade/tuppr/upgrades"
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-    namespace: flux-system
-  timeout: 5m
-  wait: false
\ No newline at end of file