diff --git a/basice2e/run.sh b/basice2e/run.sh
index a3d4b237a60e1cdd7f6740f8d23850cc209c422e..561e62d7f5faea0c08f27b3833b15d33c6019d83 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -101,7 +101,13 @@ PIDVAL=$!
 echo $PIDVAL >> results/serverpids
 echo "$UDBCMD -- $PIDVAL"
 
-sleep 5
+rm rid.txt || true
+while [ ! -s rid.txt ] && [ $cnt -lt 30 ]; do
+    sleep 1
+    grep -a "Gateway Polling for Message Reception Begun" results/udb-console.txt > rid.txt || true
+    cnt=$(($cnt + 1))
+    echo -n "."
+done
 
 runclients() {
     echo "Starting clients..."
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index b4cb0472b17603d1ac5c234b3e62cc4ff58abb65..07407e32020e83efd6e35c30583870ad751b51d1 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -9,7 +9,7 @@ registrationCode: "qpol"
 useGPU: false
 node:
     paths:
-        idf:  "nodeID-1.json"
+        idf:  "results/servers/nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-1.log"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 84a959aaf989da4e100a22059f9e03f265d0fa72..83ee21b10cd760797061b5608a79f691a55b4bbd 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -9,7 +9,7 @@ registrationCode: "yiiq"
 useGPU: false
 node:
     paths:
-        idf:  "nodeID-2.json"
+        idf:  "results/servers/nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-2.log"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 0fbd446bb5fef23c4247343c6a77ec21ae328e8d..1f8c2b30b38f3c0637cae5d234f9fdfc5995dfe2 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -9,7 +9,7 @@ registrationCode: "vydz"
 useGPU: false
 node:
     paths:
-        idf:  "nodeID-3.json"
+        idf:  "results/servers/nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-3.log"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 36cf77fc131905ffa74ceac43bb6a19debb22436..9e280ddc85d07c088ff2888ba81d23a9432c9944 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -9,7 +9,7 @@ registrationCode: "gwxs"
 useGPU: false
 node:
     paths:
-        idf:  "nodeID-4.json"
+        idf:  "results/servers/nodeID-4.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-4.log"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 571f670613cf89d32e4a05d7db3dfeb15922d0c6..f8a2a6eca79024e1e52be646ce62fd4154ca5f7f 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -9,7 +9,7 @@ registrationCode: "nahv"
 useGPU: false
 node:
     paths:
-        idf:  "nodeID-5.json"
+        idf:  "results/servers/nodeID-5.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-5.log"