diff --git a/k8s/apps/dev/application-set.yaml b/k8s/apps/dev/application-set.yaml
index 4fce73d..bf917dd 100644
--- a/k8s/apps/dev/application-set.yaml
+++ b/k8s/apps/dev/application-set.yaml
@@ -31,4 +31,4 @@ spec:
       syncPolicy:
         automated:
           selfHeal: true
-          prune: true
\ No newline at end of file
+          prune: true
diff --git a/k8s/apps/dev/project.yaml b/k8s/apps/dev/project.yaml
index 15c24a0..068dd15 100644
--- a/k8s/apps/dev/project.yaml
+++ b/k8s/apps/dev/project.yaml
@@ -9,10 +9,8 @@ spec:
   destinations:
     - namespace: 'argocd'
       server: '*'
-    - namespace: 'unrar'
-      server: '*'
     - namespace: 'whoami'
       server: '*'
   clusterResourceWhitelist:
     - group: '*'
-      kind: '*'
\ No newline at end of file
+      kind: '*'
diff --git a/k8s/apps/external/application-set.yaml b/k8s/apps/external/application-set.yaml
index 8e25d13..8d44537 100644
--- a/k8s/apps/external/application-set.yaml
+++ b/k8s/apps/external/application-set.yaml
@@ -31,4 +31,4 @@ spec:
       syncPolicy:
         automated:
           selfHeal: true
-          prune: true
\ No newline at end of file
+          prune: true
diff --git a/k8s/apps/external/haos/http-route.yaml b/k8s/apps/external/haos/http-route.yaml
index 1d59ec1..ea4c74f 100644
--- a/k8s/apps/external/haos/http-route.yaml
+++ b/k8s/apps/external/haos/http-route.yaml
@@ -14,4 +14,4 @@ spec:
   rules:
     - backendRefs:
         - name: home-assistant
-          port: 8123
\ No newline at end of file
+          port: 8123
diff --git a/k8s/apps/external/haos/kustomization.yaml b/k8s/apps/external/haos/kustomization.yaml
index ea2cdd2..dfcab9c 100644
--- a/k8s/apps/external/haos/kustomization.yaml
+++ b/k8s/apps/external/haos/kustomization.yaml
@@ -5,4 +5,4 @@ resources:
   - ns.yaml
   - svc.yaml
   - endpoint-slice.yaml
-  - http-route.yaml
\ No newline at end of file
+  - http-route.yaml
diff --git a/k8s/apps/external/haos/ns.yaml b/k8s/apps/external/haos/ns.yaml
index 5e74a7e..65d73e2 100644
--- a/k8s/apps/external/haos/ns.yaml
+++ b/k8s/apps/external/haos/ns.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: haos
\ No newline at end of file
+  name: haos
diff --git a/k8s/apps/external/haos/svc.yaml b/k8s/apps/external/haos/svc.yaml
index b36eaf0..ae22e3b 100644
--- a/k8s/apps/external/haos/svc.yaml
+++ b/k8s/apps/external/haos/svc.yaml
@@ -7,4 +7,4 @@ spec:
   ports:
     - name: http 
       protocol: TCP
-      port: 8123
\ No newline at end of file
+      port: 8123
diff --git a/k8s/apps/external/project.yaml b/k8s/apps/external/project.yaml
index 3523b11..a645064 100644
--- a/k8s/apps/external/project.yaml
+++ b/k8s/apps/external/project.yaml
@@ -17,4 +17,4 @@ spec:
       server: '*'
   clusterResourceWhitelist:
     - group: '*'
-      kind: '*'
\ No newline at end of file
+      kind: '*'
diff --git a/k8s/apps/external/truenas/tls-route.yaml b/k8s/apps/external/truenas/tls-route.yaml
index a96b6eb..580dfbf 100644
--- a/k8s/apps/external/truenas/tls-route.yaml
+++ b/k8s/apps/external/truenas/tls-route.yaml
@@ -12,4 +12,4 @@ spec:
   rules:
     - backendRefs:
         - name: truenas
-          port: 443
\ No newline at end of file
+          port: 443
diff --git a/k8s/apps/homepage/application-set.yaml b/k8s/apps/homepage/application-set.yaml
index 00da0c6..9c562a5 100644
--- a/k8s/apps/homepage/application-set.yaml
+++ b/k8s/apps/homepage/application-set.yaml
@@ -31,4 +31,4 @@ spec:
       syncPolicy:
         automated:
           selfHeal: true
-          prune: true
\ No newline at end of file
+          prune: true
diff --git a/k8s/apps/homepage/blog/hugo/svc.yaml b/k8s/apps/homepage/blog/hugo/svc.yaml
index 214f373..0b33abe 100644
--- a/k8s/apps/homepage/blog/hugo/svc.yaml
+++ b/k8s/apps/homepage/blog/hugo/svc.yaml
@@ -9,4 +9,4 @@ spec:
   ports:
     - name: web
       port: 80
-      targetPort: http
\ No newline at end of file
+      targetPort: http
diff --git a/k8s/apps/homepage/blog/ns.yaml b/k8s/apps/homepage/blog/ns.yaml
index a98aecf..8c905cd 100644
--- a/k8s/apps/homepage/blog/ns.yaml
+++ b/k8s/apps/homepage/blog/ns.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: blog
\ No newline at end of file
+  name: blog
diff --git a/k8s/apps/homepage/blog/remark42/http-route.yaml b/k8s/apps/homepage/blog/remark42/http-route.yaml
index f3cec59..3c908cc 100644
--- a/k8s/apps/homepage/blog/remark42/http-route.yaml
+++ b/k8s/apps/homepage/blog/remark42/http-route.yaml
@@ -18,4 +18,4 @@ spec:
             value: /
       backendRefs:
         - name: remark42
-          port: 80
\ No newline at end of file
+          port: 80
diff --git a/k8s/apps/homepage/blog/remark42/svc.yaml b/k8s/apps/homepage/blog/remark42/svc.yaml
index 01f9190..0ee61f3 100644
--- a/k8s/apps/homepage/blog/remark42/svc.yaml
+++ b/k8s/apps/homepage/blog/remark42/svc.yaml
@@ -9,4 +9,4 @@ spec:
   ports:
     - name: web
       port: 80
-      targetPort: http
\ No newline at end of file
+      targetPort: http
diff --git a/k8s/apps/homepage/project.yaml b/k8s/apps/homepage/project.yaml
index 2686adc..45d7280 100644
--- a/k8s/apps/homepage/project.yaml
+++ b/k8s/apps/homepage/project.yaml
@@ -15,4 +15,4 @@ spec:
       server: '*'
   clusterResourceWhitelist:
     - group: '*'
-      kind: '*'
\ No newline at end of file
+      kind: '*'
diff --git a/k8s/apps/homepage/stonegarden/deployment.yaml b/k8s/apps/homepage/stonegarden/deployment.yaml
index 9f4967f..8f5a3c4 100644
--- a/k8s/apps/homepage/stonegarden/deployment.yaml
+++ b/k8s/apps/homepage/stonegarden/deployment.yaml
@@ -35,4 +35,4 @@ spec:
               drop: [ "ALL" ]
           ports:
             - name: web
-              containerPort: 3000
\ No newline at end of file
+              containerPort: 3000
diff --git a/k8s/apps/homepage/stonegarden/http-route.yaml b/k8s/apps/homepage/stonegarden/http-route.yaml
index ce591ae..3746370 100644
--- a/k8s/apps/homepage/stonegarden/http-route.yaml
+++ b/k8s/apps/homepage/stonegarden/http-route.yaml
@@ -18,4 +18,4 @@ spec:
             value: /
       backendRefs:
         - name: stonegarden
-          port: 3000
\ No newline at end of file
+          port: 3000
diff --git a/k8s/apps/homepage/stonegarden/ns.yaml b/k8s/apps/homepage/stonegarden/ns.yaml
index e1079e3..af9de65 100644
--- a/k8s/apps/homepage/stonegarden/ns.yaml
+++ b/k8s/apps/homepage/stonegarden/ns.yaml
@@ -3,4 +3,4 @@ kind: Namespace
 metadata:
   name: stonegarden
   labels:
-    dev.stonegarden.app: homepage
\ No newline at end of file
+    dev.stonegarden.app: homepage
diff --git a/k8s/apps/kustomization.yaml b/k8s/apps/kustomization.yaml
index 7d5929f..7ef3990 100644
--- a/k8s/apps/kustomization.yaml
+++ b/k8s/apps/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: argocd
-commonLabels:
-  dev.stonegarden: app-management
-  app.kubernetes.io/managed-by: argocd
 
 resources:
   - project.yaml
diff --git a/k8s/apps/media/application-set.yaml b/k8s/apps/media/application-set.yaml
index fa5e7e1..6f59b67 100644
--- a/k8s/apps/media/application-set.yaml
+++ b/k8s/apps/media/application-set.yaml
@@ -31,4 +31,4 @@ spec:
       syncPolicy:
         automated:
           selfHeal: true
-          prune: true
\ No newline at end of file
+          prune: true
diff --git a/k8s/apps/media/arr/kustomization.yaml b/k8s/apps/media/arr/kustomization.yaml
index 46ff398..427ee46 100644
--- a/k8s/apps/media/arr/kustomization.yaml
+++ b/k8s/apps/media/arr/kustomization.yaml
@@ -13,4 +13,3 @@ resources:
   - prowlarr
   - radarr
   - sonarr
-  - torrent
diff --git a/k8s/apps/media/arr/lidarr/deployment.yaml b/k8s/apps/media/arr/lidarr/deployment.yaml
index f2e5624..9d1b47e 100644
--- a/k8s/apps/media/arr/lidarr/deployment.yaml
+++ b/k8s/apps/media/arr/lidarr/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: lidarr
-          image: ghcr.io/onedr0p/lidarr:2.4.3 # renovate: docker=ghcr.io/onedr0p/lidarr
+          image: ghcr.io/home-operations/lidarr:2.4.3 # renovate: docker=ghcr.io/home-operations/lidarr
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/k8s/apps/media/arr/ns.yaml b/k8s/apps/media/arr/ns.yaml
index 4f0d7b8..bb218a5 100644
--- a/k8s/apps/media/arr/ns.yaml
+++ b/k8s/apps/media/arr/ns.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: arr
\ No newline at end of file
+  name: arr
diff --git a/k8s/apps/media/arr/prowlarr/deployment.yaml b/k8s/apps/media/arr/prowlarr/deployment.yaml
index 06cc2e1..78cc16f 100644
--- a/k8s/apps/media/arr/prowlarr/deployment.yaml
+++ b/k8s/apps/media/arr/prowlarr/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: prowlarr
-          image: ghcr.io/onedr0p/prowlarr:1.32.2 # renovate: docker=ghcr.io/onedr0p/prowlarr
+          image: ghcr.io/home-operations/prowlarr:1.32.2 # renovate: docker=ghcr.io/home-operations/prowlarr
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/k8s/apps/media/arr/radarr/deployment.yaml b/k8s/apps/media/arr/radarr/deployment.yaml
index 90938b5..7b563d0 100644
--- a/k8s/apps/media/arr/radarr/deployment.yaml
+++ b/k8s/apps/media/arr/radarr/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: radarr
-          image: ghcr.io/onedr0p/radarr:5.19.3 # renovate: docker=ghcr.io/onedr0p/radarr
+          image: ghcr.io/home-operations/radarr:5.19.3 # renovate: docker=ghcr.io/home-operations/radarr
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/k8s/apps/media/arr/sonarr/deployment.yaml b/k8s/apps/media/arr/sonarr/deployment.yaml
index 47451fa..5ea3e4c 100644
--- a/k8s/apps/media/arr/sonarr/deployment.yaml
+++ b/k8s/apps/media/arr/sonarr/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: sonarr
-          image: ghcr.io/onedr0p/sonarr:4.0.13 # renovate: docker=ghcr.io/onedr0p/sonarr
+          image: ghcr.io/home-operations/sonarr:4.0.13 # renovate: docker=ghcr.io/home-operations/sonarr
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/k8s/apps/media/jellyfin/ns.yaml b/k8s/apps/media/jellyfin/ns.yaml
index 3afecf7..167a2cb 100644
--- a/k8s/apps/media/jellyfin/ns.yaml
+++ b/k8s/apps/media/jellyfin/ns.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: jellyfin
\ No newline at end of file
+  name: jellyfin
diff --git a/k8s/apps/media/kustomization.yaml b/k8s/apps/media/kustomization.yaml
index 7d5929f..7ef3990 100644
--- a/k8s/apps/media/kustomization.yaml
+++ b/k8s/apps/media/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: argocd
-commonLabels:
-  dev.stonegarden: app-management
-  app.kubernetes.io/managed-by: argocd
 
 resources:
   - project.yaml
diff --git a/k8s/apps/media/plex/deployment.yaml b/k8s/apps/media/plex/deployment.yaml
index 4444919..e152ea0 100644
--- a/k8s/apps/media/plex/deployment.yaml
+++ b/k8s/apps/media/plex/deployment.yaml
@@ -28,7 +28,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: plex
-          image: ghcr.io/onedr0p/plex:1.41.5.9522 # renovate: docker=ghcr.io/onedr0p/plex versioning=loose
+          image: ghcr.io/home-operations/plex:1.41.5.9522 # renovate: docker=ghcr.io/home-operations/plex versioning=loose
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/k8s/apps/media/plex/ns.yaml b/k8s/apps/media/plex/ns.yaml
index 10293c3..a05adf2 100644
--- a/k8s/apps/media/plex/ns.yaml
+++ b/k8s/apps/media/plex/ns.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: plex
\ No newline at end of file
+  name: plex
diff --git a/k8s/apps/media/project.yaml b/k8s/apps/media/project.yaml
index b7f3e99..edd742e 100644
--- a/k8s/apps/media/project.yaml
+++ b/k8s/apps/media/project.yaml
@@ -17,4 +17,4 @@ spec:
       server: '*'
   clusterResourceWhitelist:
     - group: '*'
-      kind: '*'
\ No newline at end of file
+      kind: '*'
diff --git a/k8s/apps/utils/application-set.yaml b/k8s/apps/utils/application-set.yaml
new file mode 100644
index 0000000..b502551
--- /dev/null
+++ b/k8s/apps/utils/application-set.yaml
@@ -0,0 +1,34 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: utils
+  namespace: argocd
+  labels:
+    dev.stonegarden: application
+spec:
+  generators:
+    - git:
+        repoURL: https://github.com/vehagn/homelab
+        revision: HEAD
+        directories:
+          - path: k8s/apps/utils/*
+  template:
+    metadata:
+      name: '{{ path.basename }}'
+      labels:
+        dev.stonegarden: application
+      finalizers:
+        - resources-finalizer.argocd.argoproj.io
+    spec:
+      project: dev
+      source:
+        repoURL: https://github.com/vehagn/homelab
+        targetRevision: HEAD
+        path: '{{ path }}'
+      destination:
+        name: in-cluster
+        namespace: argocd
+      syncPolicy:
+        automated:
+          selfHeal: true
+          prune: true
diff --git a/k8s/apps/utils/kustomization.yaml b/k8s/apps/utils/kustomization.yaml
new file mode 100644
index 0000000..7ef3990
--- /dev/null
+++ b/k8s/apps/utils/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: argocd
+
+resources:
+  - project.yaml
+  - application-set.yaml
diff --git a/k8s/apps/utils/project.yaml b/k8s/apps/utils/project.yaml
new file mode 100644
index 0000000..c1efb63
--- /dev/null
+++ b/k8s/apps/utils/project.yaml
@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: utils
+  namespace: argocd
+spec:
+  sourceRepos:
+    - 'https://github.com/vehagn/homelab'
+  destinations:
+    - namespace: 'argocd'
+      server: '*'
+    - namespace: 'torrent'
+      server: '*'
+    - namespace: 'unrar'
+      server: '*'
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
diff --git a/k8s/apps/media/arr/torrent/deployment.yaml b/k8s/apps/utils/torrent/deployment.yaml
similarity index 95%
rename from k8s/apps/media/arr/torrent/deployment.yaml
rename to k8s/apps/utils/torrent/deployment.yaml
index 9784a7c..22d8a40 100644
--- a/k8s/apps/media/arr/torrent/deployment.yaml
+++ b/k8s/apps/utils/torrent/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: torrent
-  namespace: arr
+  namespace: torrent
   labels:
     app: torrent
 spec:
@@ -57,7 +57,7 @@ spec:
             - name: tmp
               mountPath: /tmp
         - name: torrent
-          image: ghcr.io/onedr0p/qbittorrent:5.0.4 # renovate: docker=ghcr.io/onedr0p/qbittorrent
+          image: ghcr.io/home-operations/qbittorrent:5.0.4 # renovate: docker=ghcr.io/home-operations/qbittorrent
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/k8s/apps/media/arr/torrent/http-route.yaml b/k8s/apps/utils/torrent/http-route.yaml
similarity index 94%
rename from k8s/apps/media/arr/torrent/http-route.yaml
rename to k8s/apps/utils/torrent/http-route.yaml
index f42539e..0bf72a0 100644
--- a/k8s/apps/media/arr/torrent/http-route.yaml
+++ b/k8s/apps/utils/torrent/http-route.yaml
@@ -2,7 +2,7 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: torrent
-  namespace: arr
+  namespace: torrent
 spec:
   parentRefs:
     - name: internal
diff --git a/k8s/apps/media/arr/torrent/kustomization.yaml b/k8s/apps/utils/torrent/kustomization.yaml
similarity index 93%
rename from k8s/apps/media/arr/torrent/kustomization.yaml
rename to k8s/apps/utils/torrent/kustomization.yaml
index a9e3bc2..e4e58e3 100644
--- a/k8s/apps/media/arr/torrent/kustomization.yaml
+++ b/k8s/apps/utils/torrent/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - ns.yaml
   - pvc.yaml
   - svc.yaml
   - svc-torrent.yaml
diff --git a/k8s/apps/utils/torrent/ns.yaml b/k8s/apps/utils/torrent/ns.yaml
new file mode 100644
index 0000000..8b97aeb
--- /dev/null
+++ b/k8s/apps/utils/torrent/ns.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: torrent
diff --git a/k8s/apps/media/arr/torrent/pvc.yaml b/k8s/apps/utils/torrent/pvc.yaml
similarity index 91%
rename from k8s/apps/media/arr/torrent/pvc.yaml
rename to k8s/apps/utils/torrent/pvc.yaml
index c79a190..4e8ec0d 100644
--- a/k8s/apps/media/arr/torrent/pvc.yaml
+++ b/k8s/apps/utils/torrent/pvc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: torrent-config
-  namespace: arr
+  namespace: torrent
 spec:
   storageClassName: proxmox-csi
   volumeName: pv-torrent
diff --git a/k8s/apps/media/arr/torrent/svc-torrent.yaml b/k8s/apps/utils/torrent/svc-torrent.yaml
similarity index 96%
rename from k8s/apps/media/arr/torrent/svc-torrent.yaml
rename to k8s/apps/utils/torrent/svc-torrent.yaml
index e4d7f03..75cc5c4 100644
--- a/k8s/apps/media/arr/torrent/svc-torrent.yaml
+++ b/k8s/apps/utils/torrent/svc-torrent.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: torrent-torrent
-  namespace: arr
+  namespace: torrent
   annotations:
     io.cilium/lb-ipam-ips: 192.168.1.225
 spec:
diff --git a/k8s/apps/media/arr/torrent/svc.yaml b/k8s/apps/utils/torrent/svc.yaml
similarity index 89%
rename from k8s/apps/media/arr/torrent/svc.yaml
rename to k8s/apps/utils/torrent/svc.yaml
index c3f6ad6..f967098 100644
--- a/k8s/apps/media/arr/torrent/svc.yaml
+++ b/k8s/apps/utils/torrent/svc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: torrent
-  namespace: arr
+  namespace: torrent
 spec:
   type: ClusterIP
   selector:
diff --git a/k8s/apps/dev/unrar/deployment.yaml b/k8s/apps/utils/unrar/deployment.yaml
similarity index 100%
rename from k8s/apps/dev/unrar/deployment.yaml
rename to k8s/apps/utils/unrar/deployment.yaml
diff --git a/k8s/apps/dev/unrar/kustomization.yaml b/k8s/apps/utils/unrar/kustomization.yaml
similarity index 100%
rename from k8s/apps/dev/unrar/kustomization.yaml
rename to k8s/apps/utils/unrar/kustomization.yaml
diff --git a/k8s/apps/dev/unrar/ns.yaml b/k8s/apps/utils/unrar/ns.yaml
similarity index 74%
rename from k8s/apps/dev/unrar/ns.yaml
rename to k8s/apps/utils/unrar/ns.yaml
index 9b73091..1a8cece 100644
--- a/k8s/apps/dev/unrar/ns.yaml
+++ b/k8s/apps/utils/unrar/ns.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: unrar
\ No newline at end of file
+  name: unrar
diff --git a/renovate.json b/renovate.json
index 1b99c17..f9e865c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -27,8 +27,9 @@
     {
       "groupName": "Media containers",
       "matchPackageNames": [
-        "ghcr.io/onedr0p/**",
-        "ghcr.io/jellyfin/**"
+        "ghcr.io/jellyfin/**",
+        "ghcr.io/home-operations/plex**",
+        "ghcr.io/home-operations/**arr**"
       ]
     },
     {