diff --git a/apps/argocd/base/networking/kustomization.yaml b/apps/argocd/base/networking/kustomization.yaml
index 41f013e8c..b14a76b20 100644
--- a/apps/argocd/base/networking/kustomization.yaml
+++ b/apps/argocd/base/networking/kustomization.yaml
@@ -2,13 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- ./external-dns
-- cert-manager.yaml
-- nginx-ingress.yaml
-- tailscale-operator.yaml
-- tailscale.yaml
-- issuer.yaml
-- kube-vip.yaml
+  - ./external-dns
+  - cert-manager.yaml
+  - nginx-ingress.yaml
+  - tailscale-operator.yaml
+  - tailscale.yaml
+  - issuer.yaml
+  - kube-vip.yaml
+  - unifi-controller.yaml
 
 namespace: argocd
 
diff --git a/apps/argocd/base/apps/unifi.yaml b/apps/argocd/base/networking/unifi-controller.yaml
similarity index 60%
rename from apps/argocd/base/apps/unifi.yaml
rename to apps/argocd/base/networking/unifi-controller.yaml
index b1e45a6d8..a08e978a5 100644
--- a/apps/argocd/base/apps/unifi.yaml
+++ b/apps/argocd/base/networking/unifi-controller.yaml
@@ -3,11 +3,14 @@ kind: Application
 metadata:
   name: unifi-controller
 spec:
-  project: apps
+  project: networking
   source:
-    repoURL: 'https://github.com/gruberdev/homelab.git'
+    repoURL: "https://github.com/gruberdev/homelab.git"
     path: apps/networking/unifi/controller
     targetRevision: main
+    kustomize:
+      commonLabels:
+        app.kubernetes.io/category: networking
   destination:
     namespace: unifi
     name: in-cluster
@@ -15,15 +18,9 @@ spec:
     automated:
       prune: true
       selfHeal: true
-      allowEmpty: true
     syncOptions:
-    - Validate=false
-    - CreateNamespace=true
-    - PrunePropagationPolicy=foreground
-    - PruneLast=true
-    - ApplyOutOfSyncOnly=false
-    - Replace=true
-    - Prune=true
+      - Prune=true
+      - ServerSideApply=true
     retry:
       limit: 10
       backoff:
diff --git a/apps/argocd/base/projects/networking.yaml b/apps/argocd/base/projects/networking.yaml
index 79f642f7f..c39e4a669 100644
--- a/apps/argocd/base/projects/networking.yaml
+++ b/apps/argocd/base/projects/networking.yaml
@@ -5,26 +5,28 @@ metadata:
 spec:
   description: Networking related Kubernetes resources
   sourceRepos:
-  - '*'
+    - "*"
   destinations:
-  - namespace: kube-system
-    server: https://kubernetes.default.svc
-  - namespace: argocd
-    server: https://kubernetes.default.svc
-  - namespace: cert-manager
-    server: https://kubernetes.default.svc
-  - namespace: istio-system
-    server: https://kubernetes.default.svc
-  - namespace: networking
-    server: https://kubernetes.default.svc
-  - namespace: external-dns
-    server: https://kubernetes.default.svc
-  - namespace: tailscale
-    server: https://kubernetes.default.svc
-  - namespace: monitoring
-    server: https://kubernetes.default.svc
+    - namespace: kube-system
+      server: https://kubernetes.default.svc
+    - namespace: argocd
+      server: https://kubernetes.default.svc
+    - namespace: cert-manager
+      server: https://kubernetes.default.svc
+    - namespace: istio-system
+      server: https://kubernetes.default.svc
+    - namespace: networking
+      server: https://kubernetes.default.svc
+    - namespace: external-dns
+      server: https://kubernetes.default.svc
+    - namespace: tailscale
+      server: https://kubernetes.default.svc
+    - namespace: monitoring
+      server: https://kubernetes.default.svc
+    - namespace: unifi
+      server: https://kubernetes.default.svc
   clusterResourceWhitelist:
-  - group: '*'
-    kind: '*'
+    - group: "*"
+      kind: "*"
   orphanedResources:
     warn: true
diff --git a/apps/argocd/kustomization.yaml b/apps/argocd/kustomization.yaml
index b80998f26..5aa1528d5 100644
--- a/apps/argocd/kustomization.yaml
+++ b/apps/argocd/kustomization.yaml
@@ -23,7 +23,6 @@ resources:
 
   # Applications
   - base/apps/vault.yaml
-  - base/apps/unifi.yaml
 
   # Monitoring
   - base/monitoring/kuma.yaml
diff --git a/apps/networking/unifi/controller/base/deployment.yaml b/apps/networking/unifi/controller/base/deployment.yaml
index def99acb8..b167839f9 100644
--- a/apps/networking/unifi/controller/base/deployment.yaml
+++ b/apps/networking/unifi/controller/base/deployment.yaml
@@ -38,7 +38,6 @@ spec:
           image: jacobalberty/unifi:v7.4.162
           securityContext:
             runAsUser: 0
-            fsGroupChangePolicy: Always
             allowPrivilegeEscalation: true
           envFrom:
             - configMapRef:
@@ -80,11 +79,11 @@ spec:
               name: config
           resources:
             limits:
-              cpu: 500m
-              memory: 1.3Gi
+              cpu: 450m
+              memory: 1500Mi
             requests:
-              cpu: 100m
-              memory: 900Mi
+              cpu: 200m
+              memory: 1024Mi
           livenessProbe:
             tcpSocket:
               port: 8443