diff --git a/templates/post-install-job.yaml b/templates/post-install-job.yaml
index 2e23b9b..3bd567a 100644
--- a/templates/post-install-job.yaml
+++ b/templates/post-install-job.yaml
@@ -5,10 +5,11 @@ metadata:
   labels:
     {{- include "wordpress-nginx.labels" . | nindent 4 }}
   annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 spec:
+  ttlSecondsAfterFinished: 300
   template:
     metadata:
       name: {{ include "wordpress-nginx.fullname" . }}-show-password
@@ -35,5 +36,4 @@ spec:
               echo "kubectl get secret {{ include "wordpress-nginx.fullname" . }}-secret -o jsonpath='{.data.admin-password}' | base64 -d"
               {{- end }}
               echo ""
-              echo "Site URL: {{ .Values.wordpress.siteUrl }}"
               echo "================================================"
\ No newline at end of file