diff --git a/cluster/apps/data/pgbackups/deployment.yaml b/cluster/apps/data/pgbackups/deployment.yaml
index 7de1a5921..1d75bb38e 100644
--- a/cluster/apps/data/pgbackups/deployment.yaml
+++ b/cluster/apps/data/pgbackups/deployment.yaml
@@ -46,7 +46,7 @@ spec:
             - name: HEALTHCHECK_PORT
               value: "8080"
             - name: WEBHOOK_URL
-              value: "http://healthchecks.default.svc.cluster.local.:8000/ping/c88641a5-12f2-4f32-ab9c-5a7d122a229e"
+              value: "http://healthchecks.default.svc.cluster.local.:/ping/{ping_key}/postgresql-backup"
           resources:
             requests:
               cpu: 150m
diff --git a/cluster/apps/development/gitea/backup-job.yaml b/cluster/apps/development/gitea/backup-job.yaml
index 99a4bc8b2..e931b0964 100644
--- a/cluster/apps/development/gitea/backup-job.yaml
+++ b/cluster/apps/development/gitea/backup-job.yaml
@@ -80,7 +80,7 @@ spec:
                     echo "INFO: Backup done"
                   EOF
 
-                  curl -m 10 --retry 5 http://healthchecks.default.svc.cluster.local.:8000/ping/f7ff2516-e3b5-41ae-b77f-a9dc09005422
+                  curl -m 10 --retry 5 http://healthchecks.default.svc.cluster.local./ping/{ping_key}/k3s-gitea-repositories-backup
               volumeMounts:
                 - name: secret
                   mountPath: /opt/id_rsa
diff --git a/cluster/apps/development/gitea/helm-release.yaml b/cluster/apps/development/gitea/helm-release.yaml
index dd78416dd..6a4086427 100644
--- a/cluster/apps/development/gitea/helm-release.yaml
+++ b/cluster/apps/development/gitea/helm-release.yaml
@@ -39,11 +39,10 @@ spec:
           RUN_AT_START: true
         database:
           DB_TYPE: postgres
-          HOST: postgres.${SECRET_DOMAIN}:5432
+          HOST: postgres-rw.default.svc.cluster.local:5432
           NAME: gitea
-          USER: gitea
           SCHEMA: public
-          SSL_MODE: verify-full
+          SSL_MODE: disable
         server:
           SSH_PORT: 22
           SSH_LISTEN_PORT: 30322
@@ -146,6 +145,10 @@ spec:
       kind: Secret
       name: gitea-config
       valuesKey: dbPassword
+    - targetPath: gitea.config.database.USER
+      kind: Secret
+      name: gitea-config
+      valuesKey: dbUser
     - targetPath: gitea.config.storage.MINIO_ACCESS_KEY_ID
       kind: Secret
       name: gitea-config
diff --git a/cluster/apps/development/gitea/secret.sops.yaml b/cluster/apps/development/gitea/secret.sops.yaml
index c757012ec..889b38df9 100644
--- a/cluster/apps/development/gitea/secret.sops.yaml
+++ b/cluster/apps/development/gitea/secret.sops.yaml
@@ -8,6 +8,7 @@ stringData:
     adminEmail: ENC[AES256_GCM,data:KUhhtTXAU/lcKVsuy3tF+QjgRk8m,iv:goqGhOEkpbnYa6uELXYfdQjCdKPOW2KGAjb4cfdHrn0=,tag:SFENNvmSkEfcAgat/BHksg==,type:str]
     adminPassword: ENC[AES256_GCM,data:SMR6vlFSysGv7iG+zjk=,iv:PtceAzAWR1nc8nACAYSOe+19evR9+orQa9DRzbcXU4U=,tag:Rq+3Ua0XhOzsnFw6/OdY4A==,type:str]
     apiToken: ENC[AES256_GCM,data:k8bgQ2Rkj2rzTIk79lh3QSeJF79kQ/10K8qmdSkLedA9+0TrWe4fDA==,iv:1kl+kcBqreGZ8op35Tg9wQZOLNDSb2Gtd3OFEBYqdTk=,tag:sHX/QSr2FZBngXaPLfhhAw==,type:str]
+    dbUser: ENC[AES256_GCM,data:4Mb4+JI=,iv:qTzsuXkJGFEtKjoKcAWD2VoBCD4GIH9UsBSWUknez8c=,tag:p5Q0R1DdJuZmpPiBYZxV0A==,type:str]
     dbPassword: ENC[AES256_GCM,data:h/qQ43+3E9DfSlY6eww=,iv:ppvnc3A4binyLwnNuEPzmQCyc11RUSZ9cSw0cRYjLdI=,tag:iBXRYFPBCn4AdkdoRZK4eg==,type:str]
     minioAccessKeyId: ENC[AES256_GCM,data:Gh41eINrkyjgEpTO5O+5lPWNPd8=,iv:XFH3RvyJwUEtszqtKVjLtMxTamPHPx4Aqi0PqsUmDCQ=,tag:abNj9gjgSlPJFsS9DBs+gw==,type:str]
     minioSecretAccessKey: ENC[AES256_GCM,data:ZiCMwvRnVavI62F7+OIDoYEOSvM9Jfh1eqJGbJjOR+GiC2YXw7T4+A==,iv:bbCaIOXhwrCFqiu8AQ1qyWzE+yuTotCjJgaK14qC1Qs=,tag:ZESnmDhsgqffe1rdKoVStQ==,type:str]
@@ -27,8 +28,8 @@ sops:
             ZWRhWnBrY1FBNVQyOU0yVGFXb0QrVnMK26Nc5Bw/jOzuxXcufHcxnugG1bzqO9T8
             LNIau17zdWX5bfWGDj++ipnm8x1sPswEULal4U2Muc2Iy7GuZPhVyg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-09-14T08:59:21Z"
-    mac: ENC[AES256_GCM,data:WqdIdCfu1QJ4j8Xp7VLX2Jh3pTpyq6pLm2EIE3TCXyu2VRRGCV+Wd5AKRutMJlCS699PWUnUp3a69H6iilnYu3dXinJt7UQU+nCjk5eSkogwnb4dveAF3UfqgWor8WkxsRNiM3Q8HtkgurcHT9NjLCQvXQBCqWSVqp/6KCCetgE=,iv:ta2bK4VvxXmfAy95oyzp0PXgeoHtjUYQJa9GcVO0MK8=,tag:+tew2axfsw0yavybqUIf9Q==,type:str]
+    lastmodified: "2022-09-16T09:30:12Z"
+    mac: ENC[AES256_GCM,data:qgkG+6bxUadhllUMqkOylhLqCU5xR0pvXWi11TvRhTdC3S8dkIrmzGxWNYi9DGz2vwaPhWik4OjUpCCsjPUUxPvzzHnmc5Uqw0M+1UmX2xa7pGXXj2wgt52sBfMC/D/XIW/pbpCLwmWJveL285VaPB2psTLC4l5csw6H7dZoLKA=,iv:SMlWM/vQK0KHFELXrIEXncNcmK8oR/O31ipQLF6j2zs=,tag:kOeEcs20ItSTH1on2NvrEw==,type:str]
     pgp: []
     encrypted_regex: ^(data|stringData)$
     version: 3.7.3
diff --git a/cluster/apps/downloaders/qbittorrent-jobs/cron-job.yaml b/cluster/apps/downloaders/qbittorrent-jobs/cron-job.yaml
index 5bb0fe7dc..8c8ed0114 100644
--- a/cluster/apps/downloaders/qbittorrent-jobs/cron-job.yaml
+++ b/cluster/apps/downloaders/qbittorrent-jobs/cron-job.yaml
@@ -32,6 +32,6 @@ spec:
                   QBITTORRENT_POD=$(echo $result | awk '{ print $NF }')
                   echo $QBITTORRENT_POD | grep qbittorrent
                   test $? -eq 0 && kubectl cp /tmp/ipfilter.dat default/$QBITTORRENT_POD:/config/ipfilter.dat
-                  curl -m 10 --retry 5 http://healthchecks.default.svc.cluster.local.:8000/ping/b4651e4f-5058-436b-a237-0df660e9de9e
+                  curl -m 10 --retry 5 http://healthchecks.default.svc.cluster.local.:/ping/{ping_key}/k3s-qbittorrent-p2pblocklist
                   kubectl rollout restart deployment qbittorrent --namespace default
           restartPolicy: Never
diff --git a/cluster/apps/media-automation/recyclarr/cron-job.yaml b/cluster/apps/media-automation/recyclarr/cron-job.yaml
index 3df0ca4bc..ea427e6e5 100644
--- a/cluster/apps/media-automation/recyclarr/cron-job.yaml
+++ b/cluster/apps/media-automation/recyclarr/cron-job.yaml
@@ -30,17 +30,18 @@ spec:
                 - name: shared
                   mountPath: /shared
           containers:
-            - name: sonarrs
+            - name: sonarr
               image: ghcr.io/onedr0p/recyclarr:2.5.0@sha256:bd4dc562a12c31857c2e198de154d4ffa734d5e7f6fe817283c6fdf5807c5fb1
               env:
                 - name: TZ
                   value: "${TIMEZONE}"
               command:
-                - /app/recyclarr
-              args:
-                - sonarr
-                - --config
-                - /config/recyclarr.yaml
+                - "/bin/bash"
+                - "-c"
+                - |
+                  #!/bin/bash
+
+                  /app/recyclarr sonarr --config /config/recyclarr.yaml && curl -fsS -m 10 --retry 5 -o /dev/null https://healthchecks.default.svc.cluster.local./ping/{ping_key}/k3s-recyclarr-sonarr
               volumeMounts:
                 - name: shared
                   mountPath: /config/recyclarr.yaml
@@ -52,11 +53,12 @@ spec:
                 - name: TZ
                   value: "${TIMEZONE}"
               command:
-                - /app/recyclarr
-              args:
-                - radarr
-                - --config
-                - /config/recyclarr.yaml
+                - "/bin/bash"
+                - "-c"
+                - |
+                  #!/bin/bash
+
+                  /app/recyclarr radarr --config /config/recyclarr.yaml && curl -fsS -m 10 --retry 5 -o /dev/null https://healthchecks.default.svc.cluster.local./ping/{ping_key}/k3s-recyclarr-radarr
               volumeMounts:
                 - name: shared
                   mountPath: /config/recyclarr.yaml
diff --git a/cluster/apps/web-tools/music-transcode/cronjob.yaml b/cluster/apps/web-tools/music-transcode/cronjob.yaml
index c12e6a33e..ca37edf4f 100644
--- a/cluster/apps/web-tools/music-transcode/cronjob.yaml
+++ b/cluster/apps/web-tools/music-transcode/cronjob.yaml
@@ -47,7 +47,7 @@ spec:
                   ./transcode.bash -r
                   test $? -ne 0 && HEALTHCHECK=false
 
-                  test FLAG && curl -m 10 --retry 5 http://healthchecks.default.svc.cluster.local.:8000/ping/b99854a4-d298-4acb-a02c-a56860132de3
+                  test FLAG && curl -m 10 --retry 5 http://healthchecks.default.svc.cluster.local.:/ping/{ping_key}/k3s-transcode-music
               volumeMounts:
                 - name: music-transcoded
                   mountPath: /mnt/music_transcoded