diff --git a/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml
index 87a3c3f118..6f169a82ca 100644
--- a/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/app-sidecar.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-app-sidecar-feature-branch-1-ffac537e6cbbf934b08-1n2l4sz3
-    janitor/ttl: 7d
   labels:
     application: test-app-sidecar
     kontinuous/deployment: test-app-sidecar-feature-branch-1-ffac537e6cbbf934b08-1n2l4sz3
diff --git a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml
index e8570cba79..93d1530680 100644
--- a/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/app-simple-options.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-app-simple-options-feature-branch-1-ffac537e6cbb-ze31pkw6
-    janitor/ttl: 7d
   labels:
     application: test-app-simple-options
     kontinuous/deployment: test-app-simple-options-feature-branch-1-ffac537e6cbb-ze31pkw6
@@ -89,7 +88,6 @@ metadata:
     kontinuous/needsName: db.create-db
     kontinuous/needsNames: '[\\"db\\",\\"db.create-db\\",\\"db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-app-simple-options-feature-branch-1-ffac537e6cbb-ze31pkw6
@@ -253,7 +251,6 @@ metadata:
   annotations:
     kontinuous/needsName: db.create-secret
     kontinuous/needsNames: '[\\"db\\",\\"db.create-secret\\",\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-app-simple-options-feature-branch-1-ffac537e6cbb-ze31pkw6
@@ -414,7 +411,6 @@ metadata:
     kontinuous/needsName: seed
     kontinuous/needsNames: '[\\"seed\\"]'
     kontinuous/plugin.needs: '[\\"db\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-app-simple-options-feature-branch-1-ffac537e6cbb-ze31pkw6
@@ -553,7 +549,6 @@ metadata:
     kontinuous/needsName: seed2.seed-db
     kontinuous/needsNames: '[\\"seed2\\",\\"seed2.seed-db\\",\\"seed2..seed-db\\"]'
     kontinuous/plugin.needs: '[\\"seed\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-app-simple-options-feature-branch-1-ffac537e6cbb-ze31pkw6
diff --git a/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml b/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml
index 08d17b92f0..e35a929b94 100644
--- a/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/app-simple.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-app-simple-feature-branch-1-ffac537e6cbbf934b087-4w1j23zk
-    janitor/ttl: 7d
   labels:
     application: test-app-simple
     kontinuous/deployment: test-app-simple-feature-branch-1-ffac537e6cbbf934b087-4w1j23zk
diff --git a/packages/kontinuous/tests/__snapshots__/charts.dev.yaml b/packages/kontinuous/tests/__snapshots__/charts.dev.yaml
index 217a928dca..977b62a9f4 100644
--- a/packages/kontinuous/tests/__snapshots__/charts.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/charts.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-charts-feature-branch-1-ffac537e6cbbf934b08745a3-4f4nbjh7
-    janitor/ttl: 7d
   labels:
     application: test-charts
     kontinuous/deployment: test-charts-feature-branch-1-ffac537e6cbbf934b08745a3-4f4nbjh7
diff --git a/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml b/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml
index 1a922761a1..2b370aca99 100644
--- a/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/daemon.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-daemon-feature-branch-1-ffac537e6cbbf934b08745a3-4tm4gp79
-    janitor/ttl: 7d
   labels:
     application: test-daemon
     kontinuous/deployment: test-daemon-feature-branch-1-ffac537e6cbbf934b08745a3-4tm4gp79
diff --git a/packages/kontinuous/tests/__snapshots__/deactivate-param-not-activated.dev.yaml b/packages/kontinuous/tests/__snapshots__/deactivate-param-not-activated.dev.yaml
index d0e456fd39..afe0049bfb 100644
--- a/packages/kontinuous/tests/__snapshots__/deactivate-param-not-activated.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/deactivate-param-not-activated.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-deactivate-param-not-activated-feature-branch-1-qes6b147
-    janitor/ttl: 7d
   labels:
     application: test-deactivate-param-not-activated
     kontinuous/deployment: test-deactivate-param-not-activated-feature-branch-1-qes6b147
diff --git a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml
index 3cce60bab4..715ae811e5 100644
--- a/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/deactivate.dev.yaml
@@ -9,7 +9,6 @@ metadata:
   annotations:
     kontinuous/needsName: deactivate.delete-namespace
     kontinuous/needsNames: '[\\"deactivate\\",\\"deactivate.delete-namespace\\",\\"deactivate..delete-namespace\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.deactivate.jobs-deactivate
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/deactivate/charts/jobs-deactivate/templates/jobs.yaml
     kontinuous/deployment: test-deactivate-feature-branch-1-ffac537e6cbbf934b087-43cki7aw
diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
index 0da9b9f5b7..6da0cab1d4 100644
--- a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
-    janitor/ttl: 7d
   labels:
     application: test-extends-ovh
     kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
@@ -88,7 +87,6 @@ metadata:
   annotations:
     kontinuous/needsName: create-secrets.create-secrets
     kontinuous/needsNames: '[\\"create-secrets\\",\\"create-secrets.create-secrets\\",\\"create-secrets..create-secrets\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.pg-hasura.jobs-pg
     kontinuous/source: project/charts/fabrique/charts/pg-hasura/charts/jobs-pg/templates/jobs.yaml
     kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
@@ -252,7 +250,6 @@ metadata:
   annotations:
     kontinuous/needsName: create-secrets.create-secrets
     kontinuous/needsNames: '[\\"create-secrets\\",\\"create-secrets.create-secrets\\",\\"create-secrets..create-secrets\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.pg-keycloak.jobs-pg
     kontinuous/source: project/charts/fabrique/charts/pg-keycloak/charts/jobs-pg/templates/jobs.yaml
     kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
index 04cdd2972b..2b873d516e 100644
--- a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
@@ -248,7 +248,6 @@ metadata:
   annotations:
     kontinuous/needsName: create-secrets.create-secrets
     kontinuous/needsNames: '[\\"create-secrets\\",\\"create-secrets.create-secrets\\",\\"create-secrets..create-secrets\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.pg-hasura.jobs-pg
     kontinuous/source: project/charts/fabrique/charts/pg-hasura/charts/jobs-pg/templates/jobs.yaml
     kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
@@ -412,7 +411,6 @@ metadata:
   annotations:
     kontinuous/needsName: create-secrets.create-secrets
     kontinuous/needsNames: '[\\"create-secrets\\",\\"create-secrets.create-secrets\\",\\"create-secrets..create-secrets\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.pg-keycloak.jobs-pg
     kontinuous/source: project/charts/fabrique/charts/pg-keycloak/charts/jobs-pg/templates/jobs.yaml
     kontinuous/deployment: test-extends-ovh-feature-branch-1-ffac537e6cbbf934b08-5oa7s3iv
diff --git a/packages/kontinuous/tests/__snapshots__/force-restart-optout.dev.yaml b/packages/kontinuous/tests/__snapshots__/force-restart-optout.dev.yaml
index 4ee62ab8c4..918cee2c57 100644
--- a/packages/kontinuous/tests/__snapshots__/force-restart-optout.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/force-restart-optout.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-force-restart-optout-feature-branch-1-ffac537e6c-392utzlw
-    janitor/ttl: 7d
   labels:
     application: test-force-restart-optout
     kontinuous/deployment: test-force-restart-optout-feature-branch-1-ffac537e6c-392utzlw
diff --git a/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml b/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml
index e41e084057..57e974411e 100644
--- a/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/if-env.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-if-env-feature-branch-1-ffac537e6cbbf934b08745a3-2idnplgr
-    janitor/ttl: 7d
   labels:
     application: test-if-env
     kontinuous/deployment: test-if-env-feature-branch-1-ffac537e6cbbf934b08745a3-2idnplgr
diff --git a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml
index 27120ac8e7..167ea938b2 100644
--- a/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/include-file.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-include-file-feature-branch-1-ffac537e6cbbf934b0-3mtci4uv
-    janitor/ttl: 7d
   labels:
     application: test-include-file
     kontinuous/deployment: test-include-file-feature-branch-1-ffac537e6cbbf934b0-3mtci4uv
@@ -87,7 +86,6 @@ metadata:
   annotations:
     kontinuous/needsName: say-hello
     kontinuous/needsNames: '[\\"say-hello\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-include-file-feature-branch-1-ffac537e6cbbf934b0-3mtci4uv
diff --git a/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml b/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml
index c0d3129a61..71aea8df69 100644
--- a/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/inline-values.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-inline-values-feature-branch-1-ffac537e6cbbf934b-3dm537n4
-    janitor/ttl: 7d
   labels:
     application: test-inline-values
     kontinuous/deployment: test-inline-values-feature-branch-1-ffac537e6cbbf934b-3dm537n4
diff --git a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml
index 439c9fe9b3..35a960eb49 100644
--- a/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-job-builds-feature-branch-1-ffac537e6cbbf934b087-5o9wuk2u
-    janitor/ttl: 7d
   labels:
     application: test-job-builds
     kontinuous/deployment: test-job-builds-feature-branch-1-ffac537e6cbbf934b087-5o9wuk2u
@@ -87,7 +86,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-app.buildkit
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.build-app
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/build-app/templates/job.yaml
     kontinuous/deployment: test-job-builds-feature-branch-1-ffac537e6cbbf934b087-5o9wuk2u
@@ -288,7 +286,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-hasura.buildkit
     kontinuous/needsNames: '[\\"build-hasura\\",\\"build-hasura.buildkit\\",\\"build-hasura..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.build-hasura
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/build-hasura/templates/job.yaml
     kontinuous/deployment: test-job-builds-feature-branch-1-ffac537e6cbbf934b087-5o9wuk2u
diff --git a/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml b/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml
index e638747956..1c90e028b6 100644
--- a/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/job-no-affinity.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-job-no-affinity-feature-branch-1-ffac537e6cbbf93-3uenw7mk
-    janitor/ttl: 7d
   labels:
     application: test-job-no-affinity
     kontinuous/deployment: test-job-no-affinity-feature-branch-1-ffac537e6cbbf93-3uenw7mk
@@ -87,7 +86,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-app.buildkit
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.build-app
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/build-app/templates/job.yaml
     kontinuous/deployment: test-job-no-affinity-feature-branch-1-ffac537e6cbbf93-3uenw7mk
diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml
index 7e12427621..e032a94a9e 100644
--- a/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-jobs-build-options-feature-branch-1-ffac537e6cbb-63jpvbjn
-    janitor/ttl: 7d
   labels:
     application: test-jobs-build-options
     kontinuous/deployment: test-jobs-build-options-feature-branch-1-ffac537e6cbb-63jpvbjn
@@ -88,7 +87,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-app.buildkit
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-options-feature-branch-1-ffac537e6cbb-63jpvbjn
diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml
index 013e691567..5aad02feba 100644
--- a/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-jobs-build-stage-feature-branch-1-ffac537e6cbbf9-6bjy8r03
-    janitor/ttl: 7d
   labels:
     application: test-jobs-build-stage
     kontinuous/deployment: test-jobs-build-stage-feature-branch-1-ffac537e6cbbf9-6bjy8r03
@@ -89,7 +88,6 @@ metadata:
     kontinuous/needsName: db.create-db
     kontinuous/needsNames: '[\\"db\\",\\"db.create-db\\",\\"db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs-dev
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs-dev/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-stage-feature-branch-1-ffac537e6cbbf9-6bjy8r03
@@ -253,7 +251,6 @@ metadata:
   annotations:
     kontinuous/needsName: db.create-secret
     kontinuous/needsNames: '[\\"db\\",\\"db.create-secret\\",\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs-dev
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs-dev/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-stage-feature-branch-1-ffac537e6cbbf9-6bjy8r03
@@ -414,7 +411,6 @@ metadata:
     kontinuous/needsName: build-app.buildkit
     kontinuous/plugin.stage: build
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-stage-feature-branch-1-ffac537e6cbbf9-6bjy8r03
@@ -615,7 +611,6 @@ metadata:
     kontinuous/needsName: build-hasura.buildkit
     kontinuous/plugin.stage: build
     kontinuous/needsNames: '[\\"build-hasura\\",\\"build-hasura.buildkit\\",\\"build-hasura..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-stage-feature-branch-1-ffac537e6cbbf9-6bjy8r03
diff --git a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml
index f05e20f491..131a7a1479 100644
--- a/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-jobs-build-feature-branch-1-ffac537e6cbbf934b087-50be2a5c
-    janitor/ttl: 7d
   labels:
     application: test-jobs-build
     kontinuous/deployment: test-jobs-build-feature-branch-1-ffac537e6cbbf934b087-50be2a5c
@@ -89,7 +88,6 @@ metadata:
     kontinuous/needsName: db.create-db
     kontinuous/needsNames: '[\\"db\\",\\"db.create-db\\",\\"db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs-dev
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs-dev/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-feature-branch-1-ffac537e6cbbf934b087-50be2a5c
@@ -253,7 +251,6 @@ metadata:
   annotations:
     kontinuous/needsName: db.create-secret
     kontinuous/needsNames: '[\\"db\\",\\"db.create-secret\\",\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs-dev
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs-dev/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-feature-branch-1-ffac537e6cbbf934b087-50be2a5c
@@ -413,7 +410,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-app.buildkit
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-feature-branch-1-ffac537e6cbbf934b087-50be2a5c
@@ -613,7 +609,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-hasura.buildkit
     kontinuous/needsNames: '[\\"build-hasura\\",\\"build-hasura.buildkit\\",\\"build-hasura..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-build-feature-branch-1-ffac537e6cbbf934b087-50be2a5c
diff --git a/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml
index 3a97c5cd98..e09d14b9de 100644
--- a/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/jobs-runs-map.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-jobs-runs-map-feature-branch-1-ffac537e6cbbf934b-4ym7izxq
-    janitor/ttl: 7d
   labels:
     application: test-jobs-runs-map
     kontinuous/deployment: test-jobs-runs-map-feature-branch-1-ffac537e6cbbf934b-4ym7izxq
@@ -88,7 +87,6 @@ metadata:
     kontinuous/needsName: db.create-db
     kontinuous/needsNames: '[\\"db\\",\\"db.create-db\\",\\"db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-runs-map-feature-branch-1-ffac537e6cbbf934b-4ym7izxq
@@ -252,7 +250,6 @@ metadata:
   annotations:
     kontinuous/needsName: db.create-secret
     kontinuous/needsNames: '[\\"db\\",\\"db.create-secret\\",\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-runs-map-feature-branch-1-ffac537e6cbbf934b-4ym7izxq
diff --git a/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml
index b84bde2030..fd145fbcd0 100644
--- a/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/jobs-uses-relative.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-jobs-uses-relative-feature-branch-1-ffac537e6cbb-4qagagqn
-    janitor/ttl: 7d
   labels:
     application: test-jobs-uses-relative
     kontinuous/deployment: test-jobs-uses-relative-feature-branch-1-ffac537e6cbb-4qagagqn
@@ -88,7 +87,6 @@ metadata:
     kontinuous/needsName: db.create-db
     kontinuous/needsNames: '[\\"db\\",\\"db.create-db\\",\\"db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-uses-relative-feature-branch-1-ffac537e6cbb-4qagagqn
@@ -252,7 +250,6 @@ metadata:
   annotations:
     kontinuous/needsName: db.create-secret
     kontinuous/needsNames: '[\\"db\\",\\"db.create-secret\\",\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-uses-relative-feature-branch-1-ffac537e6cbb-4qagagqn
diff --git a/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml b/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml
index 7c8b962097..0eb2ca462c 100644
--- a/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/jobs-uses-self-ref.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-jobs-uses-self-ref-feature-branch-1-ffac537e6cbb-2y8ey2zk
-    janitor/ttl: 7d
   labels:
     application: test-jobs-uses-self-ref
     kontinuous/deployment: test-jobs-uses-self-ref-feature-branch-1-ffac537e6cbb-2y8ey2zk
@@ -88,7 +87,6 @@ metadata:
     kontinuous/needsName: db.create-db
     kontinuous/needsNames: '[\\"db\\",\\"db.create-db\\",\\"db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-uses-self-ref-feature-branch-1-ffac537e6cbb-2y8ey2zk
@@ -252,7 +250,6 @@ metadata:
   annotations:
     kontinuous/needsName: db.create-secret
     kontinuous/needsNames: '[\\"db\\",\\"db.create-secret\\",\\"db..create-secret\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-jobs-uses-self-ref-feature-branch-1-ffac537e6cbb-2y8ey2zk
diff --git a/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml b/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml
index 37ab8fbdfd..25858edc87 100644
--- a/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/long-branch-host-patch.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-long-branch-host-patch-a-very-very-very-long-bra-2prquyml
-    janitor/ttl: 7d
   labels:
     application: test-long-branch-host-patch
     kontinuous/deployment: test-long-branch-host-patch-a-very-very-very-long-bra-2prquyml
diff --git a/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml b/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml
index 9430929620..10ddbe02cc 100644
--- a/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/long-branch-host.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-long-branch-host-a-very-very-very-long-branch-na-24deasgq
-    janitor/ttl: 7d
   labels:
     application: test-long-branch-host
     kontinuous/deployment: test-long-branch-host-a-very-very-very-long-branch-na-24deasgq
diff --git a/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml b/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml
index bd0a5c07da..bcad834c1d 100644
--- a/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/maildev.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-maildev-feature-branch-1-ffac537e6cbbf934b08745a-5iniqvup
-    janitor/ttl: 7d
   labels:
     application: test-maildev
     kontinuous/deployment: test-maildev-feature-branch-1-ffac537e6cbbf934b08745a-5iniqvup
diff --git a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml
index ab7b226d97..9e433ffdf1 100644
--- a/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/meta-log.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-meta-log-feature-branch-1-ffac537e6cbbf934b08745-66eu3lo2
-    janitor/ttl: 7d
   labels:
     application: test-meta-log
     kontinuous/deployment: test-meta-log-feature-branch-1-ffac537e6cbbf934b08745-66eu3lo2
@@ -89,7 +88,6 @@ metadata:
     kontinuous/needsName: a
     kontinuous/needsNames: '[\\"a\\"]'
     kontinuous/plugin.log: \\"false\\"
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-meta-log-feature-branch-1-ffac537e6cbbf934b08745-66eu3lo2
@@ -218,7 +216,6 @@ metadata:
   annotations:
     kontinuous/needsName: b
     kontinuous/needsNames: '[\\"b\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/plugin.log: \\"true\\"
diff --git a/packages/kontinuous/tests/__snapshots__/multi-containers.dev.yaml b/packages/kontinuous/tests/__snapshots__/multi-containers.dev.yaml
index 951b90f123..8c368d582d 100644
--- a/packages/kontinuous/tests/__snapshots__/multi-containers.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/multi-containers.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-multi-containers-feature-branch-1-ffac537e6cbbf9-66ono92u
-    janitor/ttl: 7d
   labels:
     application: test-multi-containers
     kontinuous/deployment: test-multi-containers-feature-branch-1-ffac537e6cbbf9-66ono92u
diff --git a/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml b/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml
index 787f81ebc0..36f3573b4d 100644
--- a/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/needs-using-argocd-sync-waves.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-needs-using-argocd-sync-waves-feature-branch-1-f-3dcx8eip
-    janitor/ttl: 7d
   labels:
     application: test-needs-using-argocd-sync-waves
     kontinuous/deployment: test-needs-using-argocd-sync-waves-feature-branch-1-f-3dcx8eip
diff --git a/packages/kontinuous/tests/__snapshots__/output.dev.yaml b/packages/kontinuous/tests/__snapshots__/output.dev.yaml
index b5db0e4a9f..73c4ef9816 100644
--- a/packages/kontinuous/tests/__snapshots__/output.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/output.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-output-feature-branch-1-ffac537e6cbbf934b08745a3-4eok7uea
-    janitor/ttl: 7d
   labels:
     application: test-output
     kontinuous/deployment: test-output-feature-branch-1-ffac537e6cbbf934b08745a3-4eok7uea
@@ -113,7 +112,6 @@ metadata:
   annotations:
     kontinuous/needsName: a
     kontinuous/needsNames: '[\\"a\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-output-feature-branch-1-ffac537e6cbbf934b08745a3-4eok7uea
@@ -251,7 +249,6 @@ metadata:
     kontinuous/needsName: b
     kontinuous/needsNames: '[\\"b\\"]'
     kontinuous/plugin.needs: '[\\"a\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-output-feature-branch-1-ffac537e6cbbf934b08745a3-4eok7uea
diff --git a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml
index 61b8a2fe1c..1cb248738f 100644
--- a/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/override-env-default.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-override-env-default-feature-branch-1-ffac537e6c-tw0tuagy
-    janitor/ttl: 7d
   labels:
     application: test-override-env-default
     kontinuous/deployment: test-override-env-default-feature-branch-1-ffac537e6c-tw0tuagy
@@ -168,7 +167,6 @@ metadata:
   annotations:
     kontinuous/needsName: create-secrets.create-secrets
     kontinuous/needsNames: '[\\"create-secrets\\",\\"create-secrets.create-secrets\\",\\"create-secrets..create-secrets\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.pg.jobs-pg
     kontinuous/source: project/charts/fabrique/charts/pg/charts/jobs-pg/templates/jobs.yaml
     kontinuous/deployment: test-override-env-default-feature-branch-1-ffac537e6c-tw0tuagy
diff --git a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml
index df3dfd60a5..0582dc9cbe 100644
--- a/packages/kontinuous/tests/__snapshots__/pg.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/pg.prod.yaml
@@ -167,7 +167,6 @@ metadata:
   annotations:
     kontinuous/needsName: create-secrets.create-secrets
     kontinuous/needsNames: '[\\"create-secrets\\",\\"create-secrets.create-secrets\\",\\"create-secrets..create-secrets\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.cnpg.jobs-pg
     kontinuous/source: project/charts/fabrique/charts/cnpg/charts/jobs-pg/templates/jobs.yaml
     kontinuous/deployment: test-pg-feature-branch-1-ffac537e6cbbf934b08745a37893-4f12g0z3
diff --git a/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml b/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml
index a50b0089c9..24b070e775 100644
--- a/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/pgweb.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-pgweb-feature-branch-1-ffac537e6cbbf934b08745a37-51uoqv4n
-    janitor/ttl: 7d
   labels:
     application: test-pgweb
     kontinuous/deployment: test-pgweb-feature-branch-1-ffac537e6cbbf934b08745a37-51uoqv4n
diff --git a/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml b/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml
index c02df706e7..eda46c5f57 100644
--- a/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/post-renderer.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-post-renderer-feature-branch-1-ffac537e6cbbf934b-1nm6zie7
-    janitor/ttl: 7d
   labels:
     application: test-post-renderer
     kontinuous/deployment: test-post-renderer-feature-branch-1-ffac537e6cbbf934b-1nm6zie7
diff --git a/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml b/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml
index 71a9229a38..55b34f7242 100644
--- a/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/project-chart-implicit-enabled.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-project-chart-implicit-enabled-feature-branch-1-4798dszb
-    janitor/ttl: 7d
   labels:
     application: test-project-chart-implicit-enabled
     kontinuous/deployment: test-project-chart-implicit-enabled-feature-branch-1-4798dszb
diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml
index 9b31814c0f..10fb4bf795 100644
--- a/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
-    janitor/ttl: 7d
   labels:
     application: test-repo.domifa
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -124,7 +123,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-backend.buildkit
     kontinuous/needsNames: '[\\"build-backend\\",\\"build-backend.buildkit\\",\\"build-backend..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -329,7 +327,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-frontend.buildkit
     kontinuous/needsNames: '[\\"build-frontend\\",\\"build-frontend.buildkit\\",\\"build-frontend..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -535,7 +532,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-portail-admins.buildkit
     kontinuous/needsNames: '[\\"build-portail-admins\\",\\"build-portail-admins.buildkit\\",\\"build-portail-admins..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -737,7 +733,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-portail-usagers.buildkit
     kontinuous/needsNames: '[\\"build-portail-usagers\\",\\"build-portail-usagers.buildkit\\",\\"build-portail-usagers..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -941,7 +936,6 @@ metadata:
     kontinuous/needsName: create-db.create-db
     kontinuous/needsNames: '[\\"create-db\\",\\"create-db.create-db\\",\\"create-db..create-db\\"]'
     kontinuous/plugin.needs: '[\\"create-db..create-secret\\",\\"drop-db\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -1106,7 +1100,6 @@ metadata:
     kontinuous/needsName: create-db.create-secret
     kontinuous/needsNames: '[\\"create-db\\",\\"create-db.create-secret\\",\\"create-db..create-secret\\"]'
     kontinuous/plugin.needs: '[\\"drop-db\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -1266,7 +1259,6 @@ metadata:
   annotations:
     kontinuous/needsName: drop-db.drop-db
     kontinuous/needsNames: '[\\"drop-db\\",\\"drop-db.drop-db\\",\\"drop-db..drop-db\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -1406,7 +1398,6 @@ metadata:
     kontinuous/needsName: seed.seed-db
     kontinuous/needsNames: '[\\"seed\\",\\"seed.seed-db\\",\\"seed..seed-db\\"]'
     kontinuous/plugin.needs: '[\\"backend\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml
index 73b8337f05..5032091899 100644
--- a/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml
@@ -122,7 +122,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-backend.buildkit
     kontinuous/needsNames: '[\\"build-backend\\",\\"build-backend.buildkit\\",\\"build-backend..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -323,7 +322,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-frontend.buildkit
     kontinuous/needsNames: '[\\"build-frontend\\",\\"build-frontend.buildkit\\",\\"build-frontend..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -529,7 +527,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-portail-admins.buildkit
     kontinuous/needsNames: '[\\"build-portail-admins\\",\\"build-portail-admins.buildkit\\",\\"build-portail-admins..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -731,7 +728,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-portail-usagers.buildkit
     kontinuous/needsNames: '[\\"build-portail-usagers\\",\\"build-portail-usagers.buildkit\\",\\"build-portail-usagers..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
diff --git a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml
index 1cc885904b..32ce195c5c 100644
--- a/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/repo.domifa.prod.yaml
@@ -177,7 +177,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-backend.buildkit
     kontinuous/needsNames: '[\\"build-backend\\",\\"build-backend.buildkit\\",\\"build-backend..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -381,7 +380,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-frontend.buildkit
     kontinuous/needsNames: '[\\"build-frontend\\",\\"build-frontend.buildkit\\",\\"build-frontend..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -587,7 +585,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-portail-admins.buildkit
     kontinuous/needsNames: '[\\"build-portail-admins\\",\\"build-portail-admins.buildkit\\",\\"build-portail-admins..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
@@ -790,7 +787,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-portail-usagers.buildkit
     kontinuous/needsNames: '[\\"build-portail-usagers\\",\\"build-portail-usagers.buildkit\\",\\"build-portail-usagers..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-repo-domifa-feature-branch-1-ffac537e6cbbf934b08-2xrjelak
diff --git a/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml b/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml
index f8f1bdbfd4..1a6cddf838 100644
--- a/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/sample-1.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-sample-1-feature-branch-1-ffac537e6cbbf934b08745-5y3s29fx
-    janitor/ttl: 7d
   labels:
     application: test-sample-1
     kontinuous/deployment: test-sample-1-feature-branch-1-ffac537e6cbbf934b08745-5y3s29fx
diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml
index a5b0ac32ad..be19970a63 100644
--- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops-override.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-socialgouv-autodevops-override-feature-branch-1-4xh41r1h
-    janitor/ttl: 7d
   labels:
     application: test-socialgouv-autodevops-override
     kontinuous/deployment: test-socialgouv-autodevops-override-feature-branch-1-4xh41r1h
@@ -88,7 +87,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-app.buildkit
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-socialgouv-autodevops-override-feature-branch-1-4xh41r1h
diff --git a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml
index fe536cae4e..5659ed2682 100644
--- a/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/socialgouv-autodevops.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-socialgouv-autodevops-feature-branch-1-ffac537e6-3chnwvtu
-    janitor/ttl: 7d
   labels:
     application: test-socialgouv-autodevops
     kontinuous/deployment: test-socialgouv-autodevops-feature-branch-1-ffac537e6-3chnwvtu
@@ -88,7 +87,6 @@ metadata:
   annotations:
     kontinuous/needsName: build-app.buildkit
     kontinuous/needsNames: '[\\"build-app\\",\\"build-app.buildkit\\",\\"build-app..buildkit\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-socialgouv-autodevops-feature-branch-1-ffac537e6-3chnwvtu
diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml
index 7b81353d65..b151bc5251 100644
--- a/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/values-extends.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-values-extends-feature-branch-1-ffac537e6cbbf934-18dfb8mu
-    janitor/ttl: 7d
   labels:
     application: test-values-extends
     kontinuous/deployment: test-values-extends-feature-branch-1-ffac537e6cbbf934-18dfb8mu
@@ -88,7 +87,6 @@ metadata:
   annotations:
     kontinuous/needsName: seed
     kontinuous/needsNames: '[\\"seed\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-values-extends-feature-branch-1-ffac537e6cbbf934-18dfb8mu
diff --git a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml
index 45c2c96908..05860f9de2 100644
--- a/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/values-extends.preprod.yaml
@@ -87,7 +87,6 @@ metadata:
   annotations:
     kontinuous/needsName: seed
     kontinuous/needsNames: '[\\"seed\\"]'
-    janitor/ttl: 7d
     kontinuous/chartPath: project.fabrique.contrib.jobs
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/jobs/templates/jobs.yaml
     kontinuous/deployment: test-values-extends-feature-branch-1-ffac537e6cbbf934-18dfb8mu
diff --git a/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml b/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml
index b4da722e56..a4b3d41b62 100644
--- a/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml
+++ b/packages/kontinuous/tests/__snapshots__/values-js.dev.yaml
@@ -12,7 +12,6 @@ metadata:
     kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
     kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
     kontinuous/deployment: test-values-js-feature-branch-1-ffac537e6cbbf934b0874-6cv8lfvm
-    janitor/ttl: 7d
   labels:
     application: test-values-js
     kontinuous/deployment: test-values-js-feature-branch-1-ffac537e6cbbf934b0874-6cv8lfvm
diff --git a/packages/kontinuous/tests/index.test.js b/packages/kontinuous/tests/index.test.js
index f833df39a2..55926c0e52 100644
--- a/packages/kontinuous/tests/index.test.js
+++ b/packages/kontinuous/tests/index.test.js
@@ -94,6 +94,7 @@ describe("test build manifests with snapshots", () => {
       KS_DISABLE_PLUGIN: JSON.stringify([
         "fabrique/contrib/validators/kubeconform",
         "fabrique/contrib/validators/sealedSecrets",
+        "fabrique/contrib/patches/janitor",
       ]),
     }
     const envFile = `${testdirPath}/.env`
diff --git a/plugins/contrib/charts/app/values.yaml b/plugins/contrib/charts/app/values.yaml
index 67fcba1f78..32be1cefc9 100644
--- a/plugins/contrib/charts/app/values.yaml
+++ b/plugins/contrib/charts/app/values.yaml
@@ -8,7 +8,6 @@ imageRepository:
 imagePackage: app
 imageTag:
 image:
-ttl:
 rancherProjectId:
 isProd: false
 isPreProd: false
diff --git a/plugins/contrib/charts/contrib-helpers/templates/_job.yaml b/plugins/contrib/charts/contrib-helpers/templates/_job.yaml
index 1b9a1f0cb3..1744a307a7 100644
--- a/plugins/contrib/charts/contrib-helpers/templates/_job.yaml
+++ b/plugins/contrib/charts/contrib-helpers/templates/_job.yaml
@@ -49,7 +49,6 @@ metadata:
     {{- if not (kindIs "invalid" $run.log) }}
     kontinuous/plugin.log: {{ $run.log | quote }}
     {{- end }}
-    janitor/ttl: "7d"
     {{- if $run.onChangedPaths }}
     kontinuous/onChangedPaths: |
       {{- range $val := $run.onChangedPaths }}
diff --git a/plugins/contrib/charts/daemon/values.yaml b/plugins/contrib/charts/daemon/values.yaml
index 6390d4c220..fc5b174e36 100644
--- a/plugins/contrib/charts/daemon/values.yaml
+++ b/plugins/contrib/charts/daemon/values.yaml
@@ -6,7 +6,6 @@ imageRepository:
 imagePackage: daemon
 imageTag:
 image:
-ttl:
 replicas: 
 env: []
 vars: {}
diff --git a/plugins/contrib/charts/hasura/values.yaml b/plugins/contrib/charts/hasura/values.yaml
index 379eb886a3..6f8f895f55 100644
--- a/plugins/contrib/charts/hasura/values.yaml
+++ b/plugins/contrib/charts/hasura/values.yaml
@@ -7,7 +7,6 @@ imageProject:
 imageRepository:
 imagePackage: hasura
 imageTag:
-ttl:
 isProd: false
 isPreProd: false
 replicas: 1
diff --git a/plugins/contrib/charts/namespace/values.yaml b/plugins/contrib/charts/namespace/values.yaml
index 5a9c10a6ee..29e0ac11b7 100644
--- a/plugins/contrib/charts/namespace/values.yaml
+++ b/plugins/contrib/charts/namespace/values.yaml
@@ -1,6 +1,5 @@
 enabled: true
 namespace:
-ttl:
 limitMax:
   cpu: 3
   memory: 8Gi
diff --git a/plugins/contrib/charts/rancher-namespace/values.yaml b/plugins/contrib/charts/rancher-namespace/values.yaml
index 7d17497338..92a72ae1bd 100644
--- a/plugins/contrib/charts/rancher-namespace/values.yaml
+++ b/plugins/contrib/charts/rancher-namespace/values.yaml
@@ -1,6 +1,5 @@
 enabled: 
 namespace:
-ttl:
 limitMax:
   cpu: 3
   memory: 8Gi
diff --git a/plugins/contrib/package.json b/plugins/contrib/package.json
index eaf0e7ed12..f6268153d9 100644
--- a/plugins/contrib/package.json
+++ b/plugins/contrib/package.json
@@ -15,6 +15,7 @@
     "lodash.omit": "^4.5.0",
     "lodash.pick": "^4.4.0",
     "lodash.set": "^4.3.2",
+    "parse-duration": "^1.1.0",
     "slackstream": "^0.2.1"
   },
   "license": "MIT",
diff --git a/plugins/contrib/patches/30-janitor.js b/plugins/contrib/patches/30-janitor.js
index e270a616f5..55a9c196b0 100644
--- a/plugins/contrib/patches/30-janitor.js
+++ b/plugins/contrib/patches/30-janitor.js
@@ -1,6 +1,17 @@
+const parseDuration = require("parse-duration")
 const { persistPatterns } = require("../lib/persist-convention")
 
-module.exports = (manifests, options, { config, values, utils }) => {
+function resetDateToLastPeriodBasedOnDuration(date, durationSeconds) {
+  if (durationSeconds > 86400) {
+    date.setHours(0, 0, 0, 0)
+  } else if (durationSeconds > 3600) {
+    date.setMinutes(0, 0, 0)
+  } else if (durationSeconds > 60) {
+    date.setSeconds(0, 0)
+  }
+}
+
+module.exports = (manifests, options, { config, utils }) => {
   if (config.environment !== "dev") {
     return manifests
   }
@@ -13,16 +24,44 @@ module.exports = (manifests, options, { config, values, utils }) => {
       "develop",
       ...persistPatterns,
     ],
+    mode = "expires", // expire or ttl
+    ttl = "7d",
+    resetLastPeriod = true,
   } = options
 
+  let { expires = null } = options
+
   const { patternMatch } = utils
 
   if (patternMatch(config.gitBranch, permanentDevEnvironmentBranches)) {
     return
   }
 
-  const ttl =
-    (values && (values.ttl || (values.global && values.global.ttl))) || "7d"
+  const annotationKey = `janitor/${mode}`
+
+  let annotationValue
+  switch (mode) {
+    case "expires": {
+      if (expires === null) {
+        const date = new Date()
+        const duration = parseDuration(ttl)
+        if (resetLastPeriod) {
+          resetDateToLastPeriodBasedOnDuration(date, duration)
+        }
+        const formattedDate = date.toISOString()
+        expires = `${formattedDate.slice(0, -5)}Z`
+      }
+      annotationValue = expires
+      break
+    }
+    case "ttl": {
+      annotationValue = ttl
+      break
+    }
+    default: {
+      throw new Error(`Unknown mode ${mode}`)
+    }
+  }
 
   for (const manifest of manifests) {
     if (manifest.kind === "Namespace") {
@@ -32,7 +71,7 @@ module.exports = (manifests, options, { config, values, utils }) => {
       if (!manifest.metadata.annotations) {
         manifest.metadata.annotations = {}
       }
-      manifest.metadata.annotations["janitor/ttl"] = ttl
+      manifest.metadata.annotations[annotationKey] = annotationValue
     }
   }
 
diff --git a/plugins/contrib/patches/tests/janitor.test.js b/plugins/contrib/patches/tests/janitor.test.js
index 73f4be97ae..d3c484d2f5 100644
--- a/plugins/contrib/patches/tests/janitor.test.js
+++ b/plugins/contrib/patches/tests/janitor.test.js
@@ -7,7 +7,7 @@ metadata:
   name: some-ns
 `
 
-const runJanitor = async (config, values) => {
+const runJanitor = async (config, options = {}) => {
   const ctx = require("~common/ctx")
   const utils = require("~common/utils")
 
@@ -18,10 +18,12 @@ const runJanitor = async (config, values) => {
     ctx.set("logger", logger)
     return janitor(
       manifests,
-      {},
+      {
+        mode: "ttl",
+        ...options,
+      },
       {
         config,
-        values,
         ctx,
         utils,
       }
diff --git a/plugins/contrib/yarn.lock b/plugins/contrib/yarn.lock
index e784e409e8..b95f33c9e6 100644
--- a/plugins/contrib/yarn.lock
+++ b/plugins/contrib/yarn.lock
@@ -2923,6 +2923,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-duration@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "parse-duration@npm:1.1.0"
+  checksum: c860198825906ea6bc57d6de271acafabe150ae0d8e32942f9cf8eb6fc441a2756799da7d5aa9c3c5e7eb9d185e555dde0b845d8d3f40195df7062ecfd0761d6
+  languageName: node
+  linkType: hard
+
 "parse-json@npm:^5.2.0":
   version: 5.2.0
   resolution: "parse-json@npm:5.2.0"
@@ -3625,6 +3632,7 @@ __metadata:
     lodash.omit: "npm:^4.5.0"
     lodash.pick: "npm:^4.4.0"
     lodash.set: "npm:^4.3.2"
+    parse-duration: "npm:^1.1.0"
     slackstream: "npm:^0.2.1"
   languageName: unknown
   linkType: soft
diff --git a/plugins/fabrique/values-compilers/global-defaults.js b/plugins/fabrique/values-compilers/global-defaults.js
index a5bb5fe678..81b8ba7afb 100644
--- a/plugins/fabrique/values-compilers/global-defaults.js
+++ b/plugins/fabrique/values-compilers/global-defaults.js
@@ -9,7 +9,6 @@ module.exports = async (values, options, { config, utils }) => {
 
   const isProd = env === "prod"
   const isPreProd = env === "preprod"
-  const isDev = !(isProd || isPreProd)
 
   const {
     domain: defaultRootDomain,
@@ -27,10 +26,6 @@ module.exports = async (values, options, { config, utils }) => {
     ? `${repositoryName}-preprod`
     : slug(`${repositoryName}-${gitBranch}`)
 
-  const isRenovate = gitBranch.startsWith("renovate")
-
-  const ttl = isDev ? (isRenovate ? "1d" : "7d") : ""
-
   const domain = isProd
     ? defaultRootDomain
     : defaultDevDomain || `dev.${defaultRootDomain}`
@@ -57,7 +52,6 @@ module.exports = async (values, options, { config, utils }) => {
 
   const defaultValues = {
     global: {
-      ttl,
       pgSecretName,
       pgDatabase,
       pgUser,