diff --git a/cluster/apps/development/gitea/kustomization.yaml b/cluster/apps/development/gitea/kustomization.yaml
index fc96ad373..9f5ce0be2 100644
--- a/cluster/apps/development/gitea/kustomization.yaml
+++ b/cluster/apps/development/gitea/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - backup-job
+  - backup-job.yaml
   - helm-release.yaml
   - volume.yaml
diff --git a/cluster/apps/media/jobs/kustomization.yaml b/cluster/apps/media/jobs/kustomization.yaml
new file mode 100644
index 000000000..cf30275bb
--- /dev/null
+++ b/cluster/apps/media/jobs/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - serviceaccount.yaml
diff --git a/cluster/apps/media/jobs/serviceaccount.yaml b/cluster/apps/media/jobs/serviceaccount.yaml
new file mode 100644
index 000000000..7d78465bb
--- /dev/null
+++ b/cluster/apps/media/jobs/serviceaccount.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: jobs
+  namespace: media
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: jobs-edit
+  namespace: media
+subjects:
+  - kind: ServiceAccount
+    name: jobs
+roleRef:
+  kind: ClusterRole
+  name: edit
+  apiGroup: rbac.authorization.k8s.io
diff --git a/cluster/apps/media/qbittorrent/kustomization.yaml b/cluster/apps/media/qbittorrent/kustomization.yaml
index 0c710a96f..0e42e4877 100644
--- a/cluster/apps/media/qbittorrent/kustomization.yaml
+++ b/cluster/apps/media/qbittorrent/kustomization.yaml
@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - helm-release.yaml
-  - job.yaml
+  - upgrade-p2pblocklist-job.yaml
   - volumes.yaml
diff --git a/cluster/apps/media/qbittorrent/job.yaml b/cluster/apps/media/qbittorrent/upgrade-p2pblocklist-job.yaml
similarity index 82%
rename from cluster/apps/media/qbittorrent/job.yaml
rename to cluster/apps/media/qbittorrent/upgrade-p2pblocklist-job.yaml
index baebf6d05..276ed9a30 100644
--- a/cluster/apps/media/qbittorrent/job.yaml
+++ b/cluster/apps/media/qbittorrent/upgrade-p2pblocklist-job.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: qbittorrent-upgrade-p2pblocklist
@@ -10,12 +10,13 @@ spec:
     spec:
       template:
         metadata:
-          name: upgrade-p2pblocklist
+          name: qbittorrent-upgrade-p2pblocklist
         spec:
           serviceAccountName: jobs
           containers:
-            - name: tester
-              image: bitnami/kubectl:1.21.3
+            - name: qbittorrent-upgrade-p2pblocklist
+              image: registry.${SECRET_CLUSTER_DOMAIN}/homelab/home-cluster-jobs:1.1.0
+              imagePullPolicy: IfNotPresent
               command:
                 - "bin/sh"
                 - "-ec"
diff --git a/cluster/apps/media/radarr/trash-updater-job.yaml b/cluster/apps/media/radarr/trash-updater-job.yaml
index f7f5235bf..540e1586a 100644
--- a/cluster/apps/media/radarr/trash-updater-job.yaml
+++ b/cluster/apps/media/radarr/trash-updater-job.yaml
@@ -17,8 +17,8 @@ spec:
             - name: regcred
           containers:
             - name: trash-updater
-              image: registry.${SECRET_CLUSTER_DOMAIN}/homelab/home-cluster-jobs:1.0.0
-              imagePullPolicy: Always
+              image: registry.${SECRET_CLUSTER_DOMAIN}/homelab/home-cluster-jobs:1.1.0
+              imagePullPolicy: IfNotPresent
               env:
                 - name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
                   value: "1"
@@ -37,6 +37,8 @@ spec:
                   chmod 755 trash
 
                   ./trash radarr --config /opt/trash.yaml
+
+                  curl -m 10 --retry 5 https://healthchecks.k3s.xpander.ovh/ping/4776417a-8410-4c33-91ca-20e4284254f0
               volumeMounts:
                 - name: config
                   mountPath: /opt/trash.yaml
diff --git a/cluster/apps/media/sonarr/trash-updater-job.yaml b/cluster/apps/media/sonarr/trash-updater-job.yaml
index 3216ccea3..25639343d 100644
--- a/cluster/apps/media/sonarr/trash-updater-job.yaml
+++ b/cluster/apps/media/sonarr/trash-updater-job.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: sonarr-trash-updater
@@ -17,7 +17,8 @@ spec:
             - name: regcred
           containers:
             - name: trash-updater
-              image: registry.${SECRET_CLUSTER_DOMAIN}/homelab/home-cluster-jobs:1.0.0
+              image: registry.${SECRET_CLUSTER_DOMAIN}/homelab/home-cluster-jobs:1.1.0
+              imagePullPolicy: IfNotPresent
               env:
                 - name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
                   value: "1"
@@ -36,6 +37,8 @@ spec:
                   chmod 755 trash
 
                   ./trash sonarr --config /opt/trash.yaml
+
+                  curl -m 10 --retry 5 https://healthchecks.k3s.xpander.ovh/ping/f4c120e6-e12d-44b2-9ff9-e5433c0b7df4
               volumeMounts:
                 - name: config
                   mountPath: /opt/trash.yaml