diff --git a/charts/sovereign-workplace-jitsi/templates/configmap.yaml b/charts/sovereign-workplace-jitsi/templates/configmap.yaml
index 8ba88581d068523bf00db7792a651450a02319e0..936def0cc444a65eae992fa1d5746f6b9156389d 100644
--- a/charts/sovereign-workplace-jitsi/templates/configmap.yaml
+++ b/charts/sovereign-workplace-jitsi/templates/configmap.yaml
@@ -23,6 +23,8 @@ metadata:
   name: {{ include "common.names.fullname" . }}
 data:
   init.sh: |
+    #!/bin/sh
+    set -e
     {{- if (eq .Values.jitsi.jvb.service.type "LoadBalancer") }}
     counter=0
     maxRetries=30
@@ -44,8 +46,8 @@ data:
     port=$(kubectl get svc jitsi-jvb -o jsonpath='{.spec.ports[0].nodePort}');
     echo "Patching JVB to use port: ${port}"
     kubectl patch cm jitsi-jvb --type json --patch \
-      "[{ \"op\": \"add\", \"path\": \"/data/JVB_PORT\", \"value\": \"${port}\" }"
+      "[{ \"op\": \"add\", \"path\": \"/data/JVB_PORT\", \"value\": \"${port}\" }]"
     {{- end }}
     kubectl rollout restart deployment jitsi-jvb
-{{- end }}
+    {{- end }}
 ...
diff --git a/charts/sovereign-workplace-jitsi/templates/job.yaml b/charts/sovereign-workplace-jitsi/templates/job.yaml
index 318d61125c595e473a64974cbdea8b2601d6e70e..88e04297efd7bb10d1174d043fec0d70d49688b3 100644
--- a/charts/sovereign-workplace-jitsi/templates/job.yaml
+++ b/charts/sovereign-workplace-jitsi/templates/job.yaml
@@ -17,7 +17,7 @@ metadata:
 spec:
   template:
     spec:
-      restartPolicy: "Never"
+      restartPolicy: "OnFailure"
       {{- if or .Values.patchJVB.imagePullSecrets .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- range .Values.global.imagePullSecrets }}