diff --git a/infrastructure/cert-manager/cleanup/cert-manager-cleanup-job.yaml b/infrastructure/cert-manager/cleanup/cert-manager-cleanup-job.yaml
index 5c6a07e..c1de1fc 100644
--- a/infrastructure/cert-manager/cleanup/cert-manager-cleanup-job.yaml
+++ b/infrastructure/cert-manager/cleanup/cert-manager-cleanup-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cert-manager-cleanup
+  name: cert-manager-cleanup-2
   namespace: cert-manager
 spec:
   backoffLimit: 1
diff --git a/infrastructure/longhorn/adopt/longhorn-helm-adopt-job.yaml b/infrastructure/longhorn/adopt/longhorn-helm-adopt-job.yaml
index 580f5f6..e1a520a 100644
--- a/infrastructure/longhorn/adopt/longhorn-helm-adopt-job.yaml
+++ b/infrastructure/longhorn/adopt/longhorn-helm-adopt-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: longhorn-helm-adopt
+  name: longhorn-helm-adopt-2
   namespace: longhorn-system
 spec:
   backoffLimit: 1
diff --git a/services/bstein-dev-home/portal-onboarding-e2e-test-job.yaml b/services/bstein-dev-home/portal-onboarding-e2e-test-job.yaml
index 7661a31..f22272e 100644
--- a/services/bstein-dev-home/portal-onboarding-e2e-test-job.yaml
+++ b/services/bstein-dev-home/portal-onboarding-e2e-test-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: portal-onboarding-e2e-test-18
+  name: portal-onboarding-e2e-test-19
   namespace: bstein-dev-home
 spec:
   backoffLimit: 0
diff --git a/services/comms/bstein-force-leave-job.yaml b/services/comms/bstein-force-leave-job.yaml
index 07e7471..a6105cc 100644
--- a/services/comms/bstein-force-leave-job.yaml
+++ b/services/comms/bstein-force-leave-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: bstein-leave-rooms-10
+  name: bstein-leave-rooms-11
   namespace: comms
 spec:
   backoffLimit: 0
diff --git a/services/comms/comms-secrets-ensure-job.yaml b/services/comms/comms-secrets-ensure-job.yaml
index f95baa1..ab13671 100644
--- a/services/comms/comms-secrets-ensure-job.yaml
+++ b/services/comms/comms-secrets-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: comms-secrets-ensure-4
+  name: comms-secrets-ensure-5
   namespace: comms
 spec:
   backoffLimit: 1
diff --git a/services/comms/mas-admin-client-secret-ensure-job.yaml b/services/comms/mas-admin-client-secret-ensure-job.yaml
index 19f2fdf..81f35d1 100644
--- a/services/comms/mas-admin-client-secret-ensure-job.yaml
+++ b/services/comms/mas-admin-client-secret-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: mas-admin-client-secret-writer
+  name: mas-admin-client-secret-writer-2
   namespace: comms
 imagePullSecrets:
   - name: harbor-regcred
diff --git a/services/comms/mas-db-ensure-job.yaml b/services/comms/mas-db-ensure-job.yaml
index b309fb3..3ddb7e9 100644
--- a/services/comms/mas-db-ensure-job.yaml
+++ b/services/comms/mas-db-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: mas-db-ensure-20
+  name: mas-db-ensure-21
   namespace: comms
 spec:
   backoffLimit: 1
diff --git a/services/comms/mas-local-users-ensure-job.yaml b/services/comms/mas-local-users-ensure-job.yaml
index db19be2..a998445 100644
--- a/services/comms/mas-local-users-ensure-job.yaml
+++ b/services/comms/mas-local-users-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: mas-local-users-ensure-10
+  name: mas-local-users-ensure-11
   namespace: comms
 spec:
   backoffLimit: 1
diff --git a/services/comms/othrys-kick-numeric-job.yaml b/services/comms/othrys-kick-numeric-job.yaml
index 213cc3a..df22ae1 100644
--- a/services/comms/othrys-kick-numeric-job.yaml
+++ b/services/comms/othrys-kick-numeric-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: othrys-kick-numeric-5
+  name: othrys-kick-numeric-6
   namespace: comms
 spec:
   backoffLimit: 0
diff --git a/services/comms/synapse-seeder-admin-ensure-job.yaml b/services/comms/synapse-seeder-admin-ensure-job.yaml
index 6fe7d97..9905658 100644
--- a/services/comms/synapse-seeder-admin-ensure-job.yaml
+++ b/services/comms/synapse-seeder-admin-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: synapse-seeder-admin-ensure-6
+  name: synapse-seeder-admin-ensure-7
   namespace: comms
 spec:
   backoffLimit: 2
diff --git a/services/comms/synapse-signingkey-ensure-job.yaml b/services/comms/synapse-signingkey-ensure-job.yaml
index ee165f0..402a820 100644
--- a/services/comms/synapse-signingkey-ensure-job.yaml
+++ b/services/comms/synapse-signingkey-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: othrys-synapse-signingkey-ensure-6
+  name: othrys-synapse-signingkey-ensure-7
   namespace: comms
 spec:
   backoffLimit: 2
diff --git a/services/comms/synapse-user-seed-job.yaml b/services/comms/synapse-user-seed-job.yaml
index 7099e9c..7fef796 100644
--- a/services/comms/synapse-user-seed-job.yaml
+++ b/services/comms/synapse-user-seed-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: synapse-user-seed-6
+  name: synapse-user-seed-7
   namespace: comms
 spec:
   backoffLimit: 1
diff --git a/services/keycloak/logs-oidc-secret-ensure-job.yaml b/services/keycloak/logs-oidc-secret-ensure-job.yaml
index 94191e8..14e80df 100644
--- a/services/keycloak/logs-oidc-secret-ensure-job.yaml
+++ b/services/keycloak/logs-oidc-secret-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: logs-oidc-secret-ensure-9
+  name: logs-oidc-secret-ensure-10
   namespace: sso
 spec:
   backoffLimit: 0
diff --git a/services/keycloak/portal-admin-client-secret-ensure-job.yaml b/services/keycloak/portal-admin-client-secret-ensure-job.yaml
index 2eedb61..561ae00 100644
--- a/services/keycloak/portal-admin-client-secret-ensure-job.yaml
+++ b/services/keycloak/portal-admin-client-secret-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keycloak-portal-admin-secret-ensure-2
+  name: keycloak-portal-admin-secret-ensure-3
   namespace: sso
 spec:
   backoffLimit: 0
diff --git a/services/keycloak/portal-e2e-client-job.yaml b/services/keycloak/portal-e2e-client-job.yaml
index eb20440..399a32b 100644
--- a/services/keycloak/portal-e2e-client-job.yaml
+++ b/services/keycloak/portal-e2e-client-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keycloak-portal-e2e-client-6
+  name: keycloak-portal-e2e-client-7
   namespace: sso
 spec:
   backoffLimit: 0
diff --git a/services/keycloak/portal-e2e-execute-actions-email-test-job.yaml b/services/keycloak/portal-e2e-execute-actions-email-test-job.yaml
index 211bd3e..5653148 100644
--- a/services/keycloak/portal-e2e-execute-actions-email-test-job.yaml
+++ b/services/keycloak/portal-e2e-execute-actions-email-test-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keycloak-portal-e2e-execute-actions-email-12
+  name: keycloak-portal-e2e-execute-actions-email-13
   namespace: sso
 spec:
   backoffLimit: 3
diff --git a/services/keycloak/portal-e2e-target-client-job.yaml b/services/keycloak/portal-e2e-target-client-job.yaml
index 5fc9b7f..66426e0 100644
--- a/services/keycloak/portal-e2e-target-client-job.yaml
+++ b/services/keycloak/portal-e2e-target-client-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keycloak-portal-e2e-target-5
+  name: keycloak-portal-e2e-target-6
   namespace: sso
 spec:
   backoffLimit: 0
diff --git a/services/keycloak/portal-e2e-token-exchange-permissions-job.yaml b/services/keycloak/portal-e2e-token-exchange-permissions-job.yaml
index 77828ab..a6dd621 100644
--- a/services/keycloak/portal-e2e-token-exchange-permissions-job.yaml
+++ b/services/keycloak/portal-e2e-token-exchange-permissions-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keycloak-portal-e2e-token-exchange-permissions-9
+  name: keycloak-portal-e2e-token-exchange-permissions-10
   namespace: sso
 spec:
   backoffLimit: 6
diff --git a/services/keycloak/portal-e2e-token-exchange-test-job.yaml b/services/keycloak/portal-e2e-token-exchange-test-job.yaml
index 21551e0..8b7beed 100644
--- a/services/keycloak/portal-e2e-token-exchange-test-job.yaml
+++ b/services/keycloak/portal-e2e-token-exchange-test-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keycloak-portal-e2e-token-exchange-test-5
+  name: keycloak-portal-e2e-token-exchange-test-6
   namespace: sso
 spec:
   backoffLimit: 6
diff --git a/services/keycloak/synapse-oidc-secret-ensure-job.yaml b/services/keycloak/synapse-oidc-secret-ensure-job.yaml
index 1780d2e..e808e7e 100644
--- a/services/keycloak/synapse-oidc-secret-ensure-job.yaml
+++ b/services/keycloak/synapse-oidc-secret-ensure-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: synapse-oidc-secret-ensure-9
+  name: synapse-oidc-secret-ensure-10
   namespace: sso
 spec:
   backoffLimit: 0
diff --git a/services/mailu/mailu-sync-job.yaml b/services/mailu/mailu-sync-job.yaml
index 421dceb..5f0f777 100644
--- a/services/mailu/mailu-sync-job.yaml
+++ b/services/mailu/mailu-sync-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: mailu-sync-4
+  name: mailu-sync-5
   namespace: mailu-mailserver
 spec:
   template:
diff --git a/services/maintenance/k3s-traefik-cleanup-job.yaml b/services/maintenance/k3s-traefik-cleanup-job.yaml
index 5638e83..d5d12a6 100644
--- a/services/maintenance/k3s-traefik-cleanup-job.yaml
+++ b/services/maintenance/k3s-traefik-cleanup-job.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: k3s-traefik-cleanup
+  name: k3s-traefik-cleanup-2
   namespace: maintenance
 spec:
   backoffLimit: 1
diff --git a/services/monitoring/grafana-org-bootstrap.yaml b/services/monitoring/grafana-org-bootstrap.yaml
index d0791f5..f1d4075 100644
--- a/services/monitoring/grafana-org-bootstrap.yaml
+++ b/services/monitoring/grafana-org-bootstrap.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: grafana-org-bootstrap-2
+  name: grafana-org-bootstrap-3
   namespace: monitoring
 spec:
   backoffLimit: 2