diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
deleted file mode 100644
index 741e67fc..00000000
--- a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
+++ /dev/null
@@ -1,92 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: echo-server
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: app-template
-      version: 3.5.0
-      sourceRef:
-        kind: HelmRepository
-        name: bjw-s
-        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-  values:
-    controllers:
-      echo-server:
-        strategy: RollingUpdate
-        containers:
-          app:
-            image:
-              repository: ghcr.io/mendhak/http-https-echo
-              tag: 34
-            env:
-              HTTP_PORT: &port 8080
-              LOG_WITHOUT_NEWLINE: true
-              LOG_IGNORE_PATH: /healthz
-              PROMETHEUS_ENABLED: true
-            probes:
-              liveness: &probes
-                enabled: true
-                custom: true
-                spec:
-                  httpGet:
-                    path: /healthz
-                    port: *port
-                  initialDelaySeconds: 0
-                  periodSeconds: 10
-                  timeoutSeconds: 1
-                  failureThreshold: 3
-              readiness: *probes
-            securityContext:
-              allowPrivilegeEscalation: false
-              readOnlyRootFilesystem: true
-              capabilities: { drop: ["ALL"] }
-            resources:
-              requests:
-                cpu: 10m
-              limits:
-                memory: 64Mi
-    defaultPodOptions:
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 65534
-        runAsGroup: 65534
-        seccompProfile: { type: RuntimeDefault }
-    service:
-      app:
-        controller: echo-server
-        ports:
-          http:
-            port: *port
-    serviceMonitor:
-      app:
-        serviceName: echo-server
-        endpoints:
-          - port: http
-            scheme: http
-            path: /metrics
-            interval: 1m
-            scrapeTimeout: 10s
-    ingress:
-      app:
-        className: external
-        annotations:
-          external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
-        hosts:
-          - host: "{{ .Release.Name }}.${SECRET_DOMAIN}"
-            paths:
-              - path: /
-                service:
-                  identifier: app
-                  port: http
diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2
deleted file mode 100644
index 5dd7baca..00000000
--- a/bootstrap/templates/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helmrelease.yaml
diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2
deleted file mode 100644
index 2984f219..00000000
--- a/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2
+++ /dev/null
@@ -1,20 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app echo-server
-  namespace: flux-system
-spec:
-  targetNamespace: network
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/network/echo-server/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
diff --git a/kubernetes/main/apps/media/kustomization.yaml b/kubernetes/main/apps/media/kustomization.yaml
deleted file mode 100644
index 8496b615..00000000
--- a/kubernetes/main/apps/media/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./namespace.yaml
-  - ./prowlarr/ks.yaml
-  - ./qbittorrent/ks.yaml
-  - ./radarr/ks.yaml
-  - ./sonarr/ks.yaml
diff --git a/kubernetes/main/apps/media/namespace.yaml b/kubernetes/main/apps/media/namespace.yaml
deleted file mode 100644
index e4b066b2..00000000
--- a/kubernetes/main/apps/media/namespace.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: media
-  labels:
-    kustomize.toolkit.fluxcd.io/prune: disabled
diff --git a/kubernetes/main/apps/media/sonarr/app/helmrelease.yaml b/kubernetes/main/apps/media/sonarr/app/helmrelease.yaml
deleted file mode 100644
index 4467ccb3..00000000
--- a/kubernetes/main/apps/media/sonarr/app/helmrelease.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: &app sonarr
-  namespace: &namespace media
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: app-template
-      version: 3.5.0
-      interval: 30m
-      sourceRef:
-        kind: HelmRepository
-        name: bjw-s
-        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      strategy: rollback
-      retries: 3
-  values:
-    controllers:
-      sonarr:
-        annotations:
-          reloader.stakater.com/auto: "true"
-        pod:
-          nodeSelector:
-            disktype: ssd
-          securityContext:
-            runAsUser: 2000
-            runAsGroup: 2000
-            runAsNonRoot: true
-            fsGroup: 2000
-            fsGroupChangePolicy: "OnRootMismatch"
-        containers:
-          app:
-            image:
-              repository: ghcr.io/onedr0p/sonarr-develop
-              tag: 4.0.10.2579@sha256:6b4134faf8a7896a2cd9ec00bc1d98e2953959d12f8840d65bc11e087982aad9
-            env:
-              COMPlus_EnableDiagnostics: "0"
-              SONARR__APP__INSTANCENAME: Sonarr
-              SONARR__AUTH__APIKEY:
-                valueFrom:
-                  secretKeyRef:
-                    name: sonarr-secret
-                    key: api_key
-              SONARR__LOG__LEVEL: info
-              SONARR__SERVER__PORT: &port 8989
-              SONARR__UPDATE__BRANCH: develop
-              TZ: ${TIMEZONE}
-            probes:
-              liveness:
-                enabled: true
-              readiness:
-                enabled: true
-              startup:
-                enabled: true
-                spec:
-                  failureThreshold: 30
-                  periodSeconds: 5
-            resources:
-              requests:
-                cpu: 400m
-                memory: 400Mi
-              limits:
-                cpu: 400m
-                memory: 400Mi
-            securityContext:
-              allowPrivilegeEscalation: false
-              readOnlyRootFilesystem: true
-              capabilities:
-                drop:
-                  - ALL
-    service:
-      app:
-        controller: sonarr
-        ports:
-          http:
-            port: *port
-    ingress:
-      app:
-        className: internal
-        annotations:
-          gethomepage.dev/enabled: "true"
-          gethomepage.dev/group: Media
-          gethomepage.dev/icon: sonarr.png
-          gethomepage.dev/name: Sonarr
-        hosts:
-          - host: &host sonarr.${SECRET_DOMAIN}
-            paths:
-              - path: /
-                service:
-                  identifier: app
-                  port: http
-        tls:
-          - hosts:
-              - *host
-    persistence:
-      config:
-        enabled: true
-        type: persistentVolumeClaim
-        accessMode: ReadWriteOnce
-        size: 1Gi
-        labels:
-          recurring-job-group.longhorn.io/backup: enabled
-      downloads:
-        enabled: true
-        type: nfs
-        server: 192.168.0.173
-        path: /downloads
-        globalMounts:
-          - path: /media/downloads
-      series:
-        enabled: true
-        type: nfs
-        server: 192.168.0.173
-        path: /series
-        globalMounts:
-          - path: /media/series
-    defaultPodOptions:
-      dnsConfig:
-        options:
-          - name: ndots
-            value: "1"
diff --git a/kubernetes/main/apps/media/sonarr/app/kustomization.yaml b/kubernetes/main/apps/media/sonarr/app/kustomization.yaml
deleted file mode 100644
index 2e22a067..00000000
--- a/kubernetes/main/apps/media/sonarr/app/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: media
-resources:
-  - ./helmrelease.yaml
diff --git a/kubernetes/main/apps/media/sonarr/app/sonarr-secret.sops.yaml b/kubernetes/main/apps/media/sonarr/app/sonarr-secret.sops.yaml
deleted file mode 100644
index aca3e6a5..00000000
--- a/kubernetes/main/apps/media/sonarr/app/sonarr-secret.sops.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-    name: sonarr-secret
-    namespace: media
-    creationTimestamp: "2024-05-10T16:06:05Z"
-    uid: 84ab9191-e827-4e3a-906b-ccc231b3e56e
-data:
-    api_key: ENC[AES256_GCM,data:PRCkkMnYvTdY8sUdFrXQu83PzoxT0kbv9M6H/PWONfXYAWgas/5kVBBX+Oc=,iv:6Gg9TckYCamo7WKtzUEpURSgmaC5xAtMAdPmD0+Ki+w=,tag:M2tsG3v3ystVEeyc53cV7Q==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age17ary36xtm566uptguuhsj7xmuqzyz06ce54tcf6p3mge2thphqfs3gln40
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDVGtTNGh0cHcyRlY3cXU5
-            UG1KcTFwWTVPS25sVVJIakFIcDJ6dWRZUlVRCnBPNmlOemVsVUNpaXdNOTllUklo
-            Ny9qN3NuenVxeDEwd1V5eWw1L053akkKLS0tIEdRQWVYaHJhZFQyQS9jU25ZdTZp
-            K0NmWnlYbGtZTEdwcDFmVkI1cmxXRzAK+eqe9aCy3loNu+WMpoZ3gPQ6+7B/7d9O
-            jmxMtGVgm2bi3KxZGENJW/lBddCaO+AvVNv9lDXiHMYu8Ivm+wGe3w==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-10T16:10:27Z"
-    mac: ENC[AES256_GCM,data:t0EOKY2SaMMyDTf0nePEIYNXIjPTARiw6CjoWNh6NSY5hhT2LDJ28GSuxGD6wkDpwBt8FlXP2YJWYnCTac1iqS58W+5Glq90UXH7Qe5OvcDsJP1OG5bMK3Kk/+WN0FzS9+Lxjikixofut2VE7sTNeradxcN/YN6hUjyaYLE0Mrw=,iv:8aJfXyKYiZT8ELKCzqA1AU3fsrfHa/VJX5c/8u0Amy8=,tag:Iv9V0CI/50b1mElqVNwYNA==,type:str]
-    pgp: []
-    encrypted_regex: ^(data|stringData)$
-    version: 3.7.3
diff --git a/kubernetes/main/apps/media/sonarr/ks.yaml b/kubernetes/main/apps/media/sonarr/ks.yaml
deleted file mode 100644
index 4bce2ca1..00000000
--- a/kubernetes/main/apps/media/sonarr/ks.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app sonarr
-  namespace: flux-system
-spec:
-  targetNamespace: media
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./kubernetes/main/apps/media/sonarr/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-kubernetes
-  wait: false
-  interval: 30m
-  retryInterval: 1m
-  timeout: 15m
diff --git a/kubernetes/main/apps/network/unifi-controller/app/helmrelease.yaml b/kubernetes/main/apps/network/unifi-controller/app/helmrelease.yaml
deleted file mode 100644
index 2afe038f..00000000
--- a/kubernetes/main/apps/network/unifi-controller/app/helmrelease.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: &app unifi-controller
-  namespace: network
-spec:
-  interval: 1h
-  chart:
-    spec:
-      chart: app-template
-      version: 3.5.0
-      sourceRef:
-        kind: HelmRepository
-        name: bjw-s
-        namespace: flux-system
-  maxHistory: 3
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      strategy: rollback
-      retries: 3
-  uninstall:
-    keepHistory: false
-  values:
-    controllers:
-      unifi:
-        annotations:
-          reloader.stakater.com/auto: "true"
-        containers:
-          app:
-            image:
-              repository: jacobalberty/unifi
-              tag: v8.5.6@sha256:fb92425531a7dc40194668315082bb79c217417de6074127793a7e84c1d60fe8
-              pullPolicy: IfNotPresent
-            env:
-              DEBUG: "true"
-              JVM_MAX_HEAP_SIZE: 1024M
-              RUNAS_UID0: "false"
-              TZ: ${TIMEZONE}
-              UNIFI_GID: "999"
-              UNIFI_STDOUT: "true"
-              UNIFI_UID: "999"
-            resources:
-              requests:
-                memory: 2Gi
-                cpu: 50m
-    service:
-      app:
-        controller: unifi
-        type: LoadBalancer
-        externalTrafficPolicy: Cluster
-        loadBalancerIP: "192.168.0.75"
-        annotations:
-          io.cilium/lb-ipam-ips: "192.168.0.75"
-          io.cilium/lb-ipam-sharing-key: unifi
-        ports:
-          http:
-            port: 8443
-            protocol: HTTPS
-          controller:
-            enabled: true
-            port: 8080
-            protocol: TCP
-          portal-http:
-            enabled: false
-            port: 8880
-            protocol: HTTP
-          portal-https:
-            enabled: false
-            port: 8843
-            protocol: HTTPS
-          speedtest:
-            enabled: true
-            port: 6789
-            protocol: TCP
-          stun:
-            enabled: true
-            port: 3478
-            protocol: UDP
-          syslog:
-            enabled: true
-            port: 5514
-            protocol: UDP
-          discovery:
-            enabled: true
-            port: 10001
-            protocol: UDP
-    ingress:
-      app:
-        enabled: true
-        className: internal
-        annotations:
-          gethomepage.dev/enabled: "true"
-          gethomepage.dev/name: Unifi
-          gethomepage.dev/group: Network
-          gethomepage.dev/icon: unifi.png
-          nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-        hosts:
-          - host: &host unifi.${SECRET_DOMAIN}
-            paths:
-              - path: /
-                service:
-                  identifier: app
-                  port: http
-        tls:
-          - hosts:
-              - *host
-    persistence:
-      data:
-        enabled: true
-        type: persistentVolumeClaim
-        accessMode: ReadWriteOnce
-        size: 4Gi
-        advancedMounts:
-          unifi:
-            app:
-              - path: /unifi/data
-        labels:
-          recurring-job-group.longhorn.io/backup: enabled
diff --git a/kubernetes/main/apps/network/unifi-controller/app/kustomization.yaml b/kubernetes/main/apps/network/unifi-controller/app/kustomization.yaml
deleted file mode 100644
index 5dd7baca..00000000
--- a/kubernetes/main/apps/network/unifi-controller/app/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helmrelease.yaml
diff --git a/kubernetes/main/apps/network/unifi-controller/ks.yaml b/kubernetes/main/apps/network/unifi-controller/ks.yaml
deleted file mode 100644
index 7feb2177..00000000
--- a/kubernetes/main/apps/network/unifi-controller/ks.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app unifi-controller
-  namespace: flux-system
-spec:
-  targetNamespace: network
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./kubernetes/main/apps/network/unifi-controller/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-kubernetes
-  wait: true
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m