diff --git a/bin/start b/bin/start
index 480de72..05393f0 100755
--- a/bin/start
+++ b/bin/start
@@ -10,12 +10,18 @@ usage() {
   exit 2
 }
 startservice_jitsi() {
+    if [ "$JITSI_SCALE" = "server" ]; then
+      JITSI_IP="192.168.0.28 8080"
+    else
+      JITSI_IP="192.168.0.25 443"
+    fi
+
     if [ -z "$ALERTS_EMAIL" ]; then
       spin &
       SPINPID=$!
 
-      NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh  | awk -F\" '{ print $4 }'`
-      RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
+      NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$SERVICE.sh  | awk -F\" '{ print $4 }'`
+      RETRY=`grep "$JITSI_IP" /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
       start_service_withalert "jitsi" "$NC_COMMAND" "$RETRY" "no"
 
       disown $SPINPID &> /dev/null
@@ -25,8 +31,8 @@ startservice_jitsi() {
       spin &
       SPINPID=$!
 
-      NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh  | awk -F\" '{ print $4 }'`
-      RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
+      NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$SERVICE.sh  | awk -F\" '{ print $4 }'`
+      RETRY=`grep "$JITSI_IP" /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
       start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
 
       disown $SPINPID &> /dev/null
@@ -111,9 +117,24 @@ startservice_coreapp() {
 }
 startservice_all_new() {
   echo "* Starting $1."
-  NC_COMMAND=`grep start_service /federated/lib/$1.sh  | awk -F\" '{ print $4 }'`
-  RETRY=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
-  eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
+
+  if [ "$i" = "jitsi" ]; then
+    if [ "$JITSI_SCALE" = "server" ]; then
+      JITSI_IP="192.168.0.28 8080"
+      NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$1.sh  | awk -F\" '{ print $4 }'`
+      RETRY=`grep "$JITSI_IP" /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
+      eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
+    else
+      JITSI_IP="192.168.0.25 443"
+      NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$1.sh  | awk -F\" '{ print $4 }'`
+      RETRY=`grep "$JITSI_IP" /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
+      eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
+    fi
+  else
+    NC_COMMAND=`grep start_service /federated/lib/$1.sh  | awk -F\" '{ print $4 }'`
+    RETRY=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
+    eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
+  fi
 }
 
 [ $# != 1 ] && usage