diff --git a/keystone/templates/job-credential-cleanup.yaml b/keystone/templates/job-credential-cleanup.yaml
index aad01bf842..2cb0a3ecfb 100644
--- a/keystone/templates/job-credential-cleanup.yaml
+++ b/keystone/templates/job-credential-cleanup.yaml
@@ -31,8 +31,8 @@ kind: Job
 metadata:
   name: "keystone-credential-cleanup"
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeed
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-delete-policy": hook-succeeded
 spec:
   template:
     metadata:
@@ -40,7 +40,7 @@ spec:
 {{ tuple $envAll $serviceName "credential-cleanup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceName }}
-      restartPolicy: OnFailure
+      restartPolicy: Never
       nodeSelector:
 {{ toYaml $nodeSelector | indent 8 }}
       initContainers: