diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index d4fe0d85552532732eaf167c290c9599a29eb0f6..d7279d7c46f42c88e44b447c6635a3c0583a9354 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -319,7 +319,7 @@ pipeline {
                 always {
                     script {
                         dir ('archives') {
-                            sh "if [ -d */test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
+                            sh "if [ -d basic_sim/test ] || [ -d phy_sim/test]; then zip -r -qq vm_tests_logs.zip */test ; fi"
                         }
                         if(fileExists('archives/vm_tests_logs.zip')) {
                             archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index a842f9932ef660bf7ebb8f677a4a5c156196dc70..9bb67803ab4a55f5c2c8e38319c1aabf94c15a65 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -421,6 +421,10 @@ then
             echo "############################################################"
             ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < /opt/ltebox-archives/adapt_ue_sim.txt
         fi
+
+        # for the moment, just a plain sleep
+        # TODO: more sophiscated way to detect EPC is started
+        sleep 5
     fi
 
     # HERE ADD any install actions for another EPC
@@ -469,6 +473,8 @@ then
 
     ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
     rm $VM_CMDS
+    # for the moment, just a plain sleep
+    # TODO: more sophiscated way to detect eNB is started and that UE is connected
     sleep 10
     echo "ifconfig oip1 | egrep \"inet addr\" | sed -e 's#^.*inet addr:##' -e 's#  P-t-P:.*\$##'" > $VM_CMDS
     UE_IP_ADDR=`ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS`