diff --git a/oaisim/templates/job-ue-setup-if.yaml b/oaisim/templates/job-ue-setup-if.yaml
index 9117578..bb78ccf 100644
--- a/oaisim/templates/job-ue-setup-if.yaml
+++ b/oaisim/templates/job-ue-setup-if.yaml
@@ -14,24 +14,21 @@
 limitations under the License.
 */}}
 
-{{- $releaseName := .Release.Name }}
-{{- $namespace := .Release.Namespace }}
-{{- $name := .Values.config.ue.name }}
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ $name }}-setup-if
+  name: ue-setup-if
   labels:
-    app: {{ $name }}
+{{ tuple "ue" . | include "oaisim.metadata_labels" | indent 4 }}
   annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
 spec:
   template:
     metadata:
       labels:
-        app: {{ $name }}
+{{ tuple "ue" . | include "oaisim.metadata_labels" | indent 8 }}
     spec:
     {{- if .Values.nodeSelectors.enabled }}
       nodeSelector: