diff --git a/charts/sovereign-workplace-jitsi/templates/configmap.yaml b/charts/sovereign-workplace-jitsi/templates/configmap.yaml
index 6a039d22a5c730684d0c2863d03af66d6b39a5f4..c3091a8bae9ac4078f6e08f4d839e3c6d351b0cd 100644
--- a/charts/sovereign-workplace-jitsi/templates/configmap.yaml
+++ b/charts/sovereign-workplace-jitsi/templates/configmap.yaml
@@ -30,7 +30,7 @@ data:
     maxRetries=30
     until [ $counter -gt ${maxRetries} ]; do
     echo "Wait for LoadBalancer IP (${counter}/${maxRetries})"
-    ip=$(kubectl get svc jitsi-jvb -o jsonpath='{.status.loadBalancer.ingress[0].ip}');
+    ip=$(kubectl get svc jitsi-jvb -o jsonpath='{.status.loadBalancer.ingress[0].{{ .Values.patchJVB.configuration.loadbalancerStatusField }}' || true);
     if [ ${ip} ]; then
       break;
     else
@@ -38,6 +38,11 @@ data:
       sleep 5;
     fi
     done
+    if [ $counter -le 0 ]; then
+      echo "Reached retries limit, exiting..."
+      exit 1
+    fi;
+
     echo "Patching JVB to advertise IP: ${ip}"
     kubectl patch cm jitsi-jvb --type json --patch \
       "[{ \"op\": \"add\", \"path\": \"/data/JVB_ADVERTISE_IPS\", \"value\": \"${ip}\" },
diff --git a/charts/sovereign-workplace-jitsi/values.yaml b/charts/sovereign-workplace-jitsi/values.yaml
index 1ce4306fcd22eb748d4825daac9f8c11dbc31232..f24dedcb16dad91abe2024e0063481d973703caf 100644
--- a/charts/sovereign-workplace-jitsi/values.yaml
+++ b/charts/sovereign-workplace-jitsi/values.yaml
@@ -92,6 +92,11 @@ patchJVB:
     # your ingress gateway.
     staticLoadbalancerIP: ""
 
+    # -- Relevant for LoadBalancer deployment only.
+    # The IP/DNS of your load-balancer will be fetched from the status entry of service - here you can define which
+    # field should be taken.
+    loadbalancerStatusField: "ip"
+
   # Security Context.
   # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   containerSecurityContext: