diff --git a/clusters/kubenuc/apps/sysdig-agent/deploy.yaml b/clusters/kubenuc/apps/sysdig-agent/deploy.yaml
index 2937c56c..9394cbf5 100644
--- a/clusters/kubenuc/apps/sysdig-agent/deploy.yaml
+++ b/clusters/kubenuc/apps/sysdig-agent/deploy.yaml
@@ -5,6 +5,7 @@ metadata:
   name: sysdig-agent-secrets
   namespace: flux-system
 spec:
+  targetNamespace: sysdig-agent
   interval: 15m
   sourceRef:
     kind: GitRepository
@@ -18,7 +19,7 @@ metadata:
   name: sysdig-agent
   namespace: flux-system
 spec:
-  targetNamespace: cloudflare
+  targetNamespace: sysdig-agent
   path: ./clusters/kubenuc/apps/sysdig-agent/manifests
   prune: true
   sourceRef:
diff --git a/clusters/kubenuc/apps/sysdig-harbor-scanner/release.yml b/clusters/kubenuc/apps/sysdig-harbor-scanner/manifests/release.yml
similarity index 100%
rename from clusters/kubenuc/apps/sysdig-harbor-scanner/release.yml
rename to clusters/kubenuc/apps/sysdig-harbor-scanner/manifests/release.yml
diff --git a/clusters/kubenuc/apps/sysdig-harbor-scanner/secrets.yaml b/clusters/kubenuc/apps/sysdig-harbor-scanner/secrets.yaml
index 29080f62..d43ca3cf 100644
--- a/clusters/kubenuc/apps/sysdig-harbor-scanner/secrets.yaml
+++ b/clusters/kubenuc/apps/sysdig-harbor-scanner/secrets.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -8,5 +9,18 @@ spec:
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps/kubenuc/sysdig-agent/secrets
+  path: ./clusters/kubenuc/apps/sysdig-agent/secrets
+  prune: true
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: harbor-scanner
+  namespace: flux-system
+spec:
+  interval: 15m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./clusters/kubenuc/apps/sysdig-agent/manifests
   prune: true
diff --git a/clusters/kubenuc/apps/system-upgrade-controller/deploy-app.yaml b/clusters/kubenuc/apps/system-upgrade-controller/deploy.yaml
similarity index 76%
rename from clusters/kubenuc/apps/system-upgrade-controller/deploy-app.yaml
rename to clusters/kubenuc/apps/system-upgrade-controller/deploy.yaml
index f68b3e84..7e54e6fd 100644
--- a/clusters/kubenuc/apps/system-upgrade-controller/deploy-app.yaml
+++ b/clusters/kubenuc/apps/system-upgrade-controller/deploy.yaml
@@ -8,5 +8,5 @@ spec:
   sourceRef:
     kind: GitRepository
     name: flux-system
-  path: ./apps/kubenuc/system-upgrade-controller/manifests
+  path: ./clusters/kubenuc/apps/system-upgrade-controller/manifests
   prune: true
diff --git a/clusters/kubenuc/apps/zabbix/deploy.yaml b/clusters/kubenuc/apps/zabbix/deploy.yaml
new file mode 100644
index 00000000..f09a289b
--- /dev/null
+++ b/clusters/kubenuc/apps/zabbix/deploy.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: zabbix-proxy
+  namespace: flux-system
+spec:
+  targetNamespace: zabbix
+  interval: 15m
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+  path: ./clusters/kubenuc/apps/zabbix/manifests
+  prune: true
diff --git a/clusters/kubenuc/apps/zabbix/release.yml b/clusters/kubenuc/apps/zabbix/manifests/release.yml
similarity index 100%
rename from clusters/kubenuc/apps/zabbix/release.yml
rename to clusters/kubenuc/apps/zabbix/manifests/release.yml