diff --git a/apps/media/qbittorrent/deployment.yaml b/apps/media/qbittorrent/deployment.yaml
deleted file mode 100644
index 86ac2a7..0000000
--- a/apps/media/qbittorrent/deployment.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: qbittorrent
-  namespace: media
-spec:
-  selector:
-    matchLabels:
-      app: qbittorrent
-  template:
-    metadata:
-      labels:
-        app: qbittorrent
-    spec:
-      securityContext:
-        sysctls:
-        - name: net.ipv4.conf.all.src_valid_mark
-          value: "1"
-      containers:
-      - name: qbittorrent
-        image: lscr.io/linuxserver/qbittorrent:libtorrentv1
-        envFrom:
-        - configMapRef:
-            name: qbittorrent-config
-            optional: false
-        ports:
-        - containerPort: 8080
-          name: http
-          protocol: TCP
-        volumeMounts:
-        - name: qbittorrent-config
-          mountPath: /config
-        - name: data
-          mountPath: /data/downloads
-          subPath: downloads
-      - name: wireguard
-        image: lscr.io/linuxserver/wireguard:latest
-        envFrom:
-        - configMapRef:
-            name: wireguard-config
-        securityContext:
-          capabilities:
-            add:
-            - NET_ADMIN
-        volumeMounts:
-        - name: wireguard-config-secret
-          mountPath: /config/wg_confs
-        - name: wireguard-config
-          mountPath: /config
-        - name: natpmp-script
-          mountPath: /custom-services.d/natpmp.sh
-          subPath: natpmp.sh
-          readOnly: true
-      volumes:
-      - name: qbittorrent-config
-        persistentVolumeClaim:
-          claimName: qbittorrent-config
-      - name: data
-        persistentVolumeClaim:
-          claimName: media-data
-      - name: wireguard-config
-        persistentVolumeClaim:
-          claimName: wireguard-config
-      - name: wireguard-config-secret
-        secret:
-          secretName: wireguard-config-secret
-      - name: natpmp-script
-        configMap:
-          name: natpmp-script
diff --git a/apps/media/qbittorrent/dns-endpoint.yaml b/apps/media/qbittorrent/dns-endpoint.yaml
deleted file mode 100644
index d9d80d6..0000000
--- a/apps/media/qbittorrent/dns-endpoint.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: externaldns.k8s.io/v1alpha1
-kind: DNSEndpoint
-metadata:
-  name: qbittorrent.michaelthomson.dev
-  namespace: media
-spec:
-  endpoints:
-  - dnsName: qbittorrent.michaelthomson.dev
-    recordTTL: 180
-    recordType: CNAME
-    targets:
-    - server.michaelthomson.dev
diff --git a/apps/media/qbittorrent/ingress.yaml b/apps/media/qbittorrent/ingress.yaml
deleted file mode 100644
index c835015..0000000
--- a/apps/media/qbittorrent/ingress.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: qbittorrent
-  namespace: media
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-spec:
-  rules:
-  - host: qbittorrent.michaelthomson.dev
-    http:
-      paths:
-      - pathType: ImplementationSpecific
-        path: /
-        backend:
-          service:
-            name: qbittorrent
-            port: 
-              name: http
-  tls:
-    - hosts:
-        - qbittorrent.michaelthomson.dev
-      secretName: letsencrypt-wildcard-cert-michaelthomson.dev
diff --git a/apps/media/qbittorrent/natpmp-script.yaml b/apps/media/qbittorrent/natpmp-script.yaml
deleted file mode 100644
index 7fa0f74..0000000
--- a/apps/media/qbittorrent/natpmp-script.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: v1
-data:
-  natpmp.sh: |
-    #!/bin/sh
-
-    while true; do
-        date
-
-        natpmpc -a 1 0 udp 60 -g 10.2.0.1 && natpmpc -a 1 0 tcp 60 -g 10.2.0.1 > /tmp/natpmpc_output || {
-            echo -e "ERROR with natpmpc command \a"
-            break
-        }
-
-        port=$(grep 'TCP' /tmp/natpmpc_output | grep -o 'Mapped public port [0-9]*' | awk '{print $4}')
-        currentPort=$(curl -XGET 'http://127.0.0.1:8080/api/v2/app/preferences' | jq '.listen_port')
-
-        echo "Opened port: $port"
-        echo "Current port: $currentPort"
-        if [ "$currentPort" != "$port" ]; then
-            echo "Current port is different. Changing from $currentPort to $port"
-            code=$(curl --write-out '%{http_code}' --silent --output /dev/null -XPOST -d "json={\"listen_port\":$port}" "http://127.0.0.1:8080/api/v2/app/setPreferences")
-
-            if [ "$code" != "200" ]; then
-                echo "ERROR: port change failed with status code $code"
-            else
-                echo "Port changed to $port successfully"
-            fi
-        fi
-        sleep 45
-    done
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  name: natpmp-script
-  namespace: media
diff --git a/apps/media/qbittorrent/pvc-qbittorrent-config.yaml b/apps/media/qbittorrent/pvc-qbittorrent-config.yaml
deleted file mode 100644
index 35da3ef..0000000
--- a/apps/media/qbittorrent/pvc-qbittorrent-config.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: qbittorrent-config
-  namespace: media
-spec:
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: longhorn
-  accessModes:
-    - ReadWriteOnce
diff --git a/apps/media/qbittorrent/pvc-wireguard-config.yaml b/apps/media/qbittorrent/pvc-wireguard-config.yaml
deleted file mode 100644
index e217773..0000000
--- a/apps/media/qbittorrent/pvc-wireguard-config.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wireguard-config
-  namespace: media
-spec:
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: longhorn
-  accessModes:
-    - ReadWriteOnce
diff --git a/apps/media/qbittorrent/qbittorrent-config.yaml b/apps/media/qbittorrent/qbittorrent-config.yaml
deleted file mode 100644
index fea204e..0000000
--- a/apps/media/qbittorrent/qbittorrent-config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: qbittorrent-config
-  namespace: media
-data:
-  PUID: "1000"
-  PGID: "1000"
diff --git a/apps/media/qbittorrent/service.yaml b/apps/media/qbittorrent/service.yaml
deleted file mode 100644
index dca4685..0000000
--- a/apps/media/qbittorrent/service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: qbittorrent
-  namespace: media
-spec:
-  selector:
-    app: qbittorrent
-  ports:
-  - port: 80
-    targetPort: http
-    name: http
diff --git a/apps/media/qbittorrent/wireguard-config-secret.yaml b/apps/media/qbittorrent/wireguard-config-secret.yaml
deleted file mode 100644
index 8b9c228..0000000
--- a/apps/media/qbittorrent/wireguard-config-secret.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "kind": "SealedSecret",
-  "apiVersion": "bitnami.com/v1alpha1",
-  "metadata": {
-    "name": "wireguard-config-secret",
-    "namespace": "media",
-    "creationTimestamp": null
-  },
-  "spec": {
-    "template": {
-      "metadata": {
-        "name": "wireguard-config-secret",
-        "namespace": "media",
-        "creationTimestamp": null
-      }
-    },
-    "encryptedData": {
-      "wg0.conf": "AgClUxLYCyjV/nHiKlwxkOiGXNIRFe8hRi/6uRJZsyXf5PcUe2bh8ubCPEg+7wmF5r/ZDMbfQnJHwzHFu4fSdSXNbJELMVO4kjyFPsH3f5N2iSBzxBaEeARGHd4ijOsOJvevpw5UW+R+aWnGpY+L09Rcbla5Ak/xRgTfCLaHn+AFC7G5FigvxLLXuJZRYPWvrUSK2P3ZQLc4xGjRHD3xDCrb5gjrzdt3ZqyaMqpufdQRaMnsqY1BqHzqHR11l5MhwK7jb/Ge+aNgRckheKqwlCL2aebSciFzdzr0Ve4oJN0neNiK7P8r0BjRSnHfeyhzmed8DwcTej1xJFt/mX+h8XrUS0i7ioPaUc/t159bPdjZuXdGFPtTGg66nUzKeLm1DOyB+sn80d5M9X4rDe5Poyyff56XxtLd1XCDuuPL9YZDTuETupaLm+57hsnHYIoCe7rmTg0pH5iZzO3p+pwplZMIB/VCDKM1HW6b91Yn1CqGOHfNM3qrrxgppz97G1568cDII+W5F5MZXPCb8ENZGzjm6FVDrHrLiYqAP+j6lTNN0WqNclnsLlcyckzXNpickdMeDRU/rnzNrpT1VDRgaCuU2vnZ91bh9ZcUBfm0aWcNl9wves8FHH+yt4YzKLVXG8Sm4sYRkeqEmrMUwrXbcG0l+b0tunT2QOZHNf5lUgHPjoyfp8ynpFrEsrZF9FH7/tB2Z6whbjYo1LDGunQ0aBCqfx2n4xNAb9urfh/fTxjT28PCGzYp9snCtmfGPcvCtkBy9cJeDiX4AE9PZsFTUzRjZUqRqKg+6QK4fZHkxYzpuzgH3cAsgG97RIcllNLA4fhN66SIAXjSrfVg8XYwXgHeyoRpcwhJ7WhiOaFSCccbXxEUVgzJ7O8KpCpbQlaYWbXbtpptAkBbNzPJ9kF+baOgD6SxbgFdc9V+oSM8sX/FubfK8Spm9fqu0slQaygvZX1ote67WWNK2uy8W82hymYS96g2FWghFnSbYEgrDUO8ASF4zhtPWyTWr45+Ba4WfQ3hZApTW5jJczjAn7w95ySt4gHFRxVmvbV8topVz8jO2V8t//OuRaQMpBLYjQVSGo60vuWIxFcgKqb2UxXiEqRWxhDWkjHx9RX9pCR9St0p6u/WL8Iwemq5a7RIedHQkuKmorOP100zCp4njsuRfN+kodtk0PjtZNJaVdbAVn9TYyY="
-    }
-  }
-}
diff --git a/apps/media/qbittorrent/wireguard-config.yaml b/apps/media/qbittorrent/wireguard-config.yaml
deleted file mode 100644
index 0dda7eb..0000000
--- a/apps/media/qbittorrent/wireguard-config.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: wireguard-config
-  namespace: media
-data:
-  PUID: "1000"
-  GUID: "1000"
-  TZ: America/Toronto
-  DOCKER_MODS: linuxserver/mods:universal-package-install
-  INSTALL_PACKAGES: libnatpmp|jq
-  # DOCKER_MODS: ghcr.io/fusetim/external_natpmp_qbittorrent:ecf567b21e5f079762e36c9cee9afaf86fcb22be
diff --git a/apps/media/readarr/config.yaml b/apps/media/readarr/config.yaml
deleted file mode 100644
index 61d07de..0000000
--- a/apps/media/readarr/config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: readarr-config
-  namespace: media
-data:
-  PUID: "1000"
-  PGID: "1000"
diff --git a/apps/media/readarr/deployment.yaml b/apps/media/readarr/deployment.yaml
deleted file mode 100644
index 3a7b182..0000000
--- a/apps/media/readarr/deployment.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: readarr
-  namespace: media
-spec:
-  selector:
-    matchLabels:
-      app: readarr
-  template:
-    metadata:
-      labels:
-        app: readarr
-    spec:
-      containers:
-      - name: readarr
-        image: lscr.io/linuxserver/readarr:nightly
-        imagePullPolicy: Always
-        envFrom:
-        - configMapRef:
-            name: readarr-config
-            optional: false
-        ports:
-        - containerPort: 8787
-          name: http
-          protocol: TCP
-        volumeMounts:
-        - name: config
-          mountPath: /config
-        - mountPath: /data
-          name: data
-      volumes:
-      - name: config
-        persistentVolumeClaim: 
-          claimName: readarr-config
-      - name: data
-        persistentVolumeClaim: 
-          claimName: media-data
-            
-          
diff --git a/apps/media/readarr/dns-endpoint.yaml b/apps/media/readarr/dns-endpoint.yaml
deleted file mode 100644
index e11387c..0000000
--- a/apps/media/readarr/dns-endpoint.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: externaldns.k8s.io/v1alpha1
-kind: DNSEndpoint
-metadata:
-  name: readarr.michaelthomson.dev
-  namespace: media
-spec:
-  endpoints:
-  - dnsName: readarr.michaelthomson.dev
-    recordTTL: 180
-    recordType: CNAME
-    targets:
-    - server.michaelthomson.dev
diff --git a/apps/media/readarr/ingress.yaml b/apps/media/readarr/ingress.yaml
deleted file mode 100644
index 7f2e298..0000000
--- a/apps/media/readarr/ingress.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: readarr
-  namespace: media
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-spec:
-  rules:
-  - host: readarr.michaelthomson.dev
-    http:
-      paths:
-      - pathType: ImplementationSpecific
-        path: /
-        backend:
-          service:
-            name: readarr
-            port: 
-              name: http
-  tls:
-    - hosts:
-        - readarr.michaelthomson.dev
-      secretName: letsencrypt-wildcard-cert-michaelthomson.dev
diff --git a/apps/media/readarr/pvc-config.yaml b/apps/media/readarr/pvc-config.yaml
deleted file mode 100644
index 8648de3..0000000
--- a/apps/media/readarr/pvc-config.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: readarr-config
-  namespace: media
-spec:
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: longhorn
-  accessModes:
-    - ReadWriteOnce
diff --git a/apps/media/readarr/service.yaml b/apps/media/readarr/service.yaml
deleted file mode 100644
index b8f7053..0000000
--- a/apps/media/readarr/service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: readarr
-  namespace: media
-spec:
-  selector:
-    app: readarr
-  ports:
-  - port: 80
-    targetPort: http
-    name: http