diff --git a/templates/job-configure-nextcloud.yaml b/templates/job-configure-nextcloud.yaml
index c8856f1a2a5adb23d347641b77ae08c267603522..902797bf0f7f34ebe678dbe41aebae4387dece8e 100644
--- a/templates/job-configure-nextcloud.yaml
+++ b/templates/job-configure-nextcloud.yaml
@@ -9,7 +9,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   template:
     metadata:
diff --git a/templates/job-setup-apps.yaml b/templates/job-setup-apps.yaml
index 8579691839fdab41ca5179ea377d02e9d5a231e6..950503536bb9d0d1568ff279a2eb2bbca7805aa8 100644
--- a/templates/job-setup-apps.yaml
+++ b/templates/job-setup-apps.yaml
@@ -1,5 +1,3 @@
-# Work around the fact that we can not index hyphenated names
-# (https://github.com/helm/helm/issues/2993)
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -11,7 +9,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   backoffLimit: {{ .Values.setupApps.backoffLimit }}
   template: