diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 9f1e75a..3ef3249 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -208,6 +208,8 @@
 
            elif [[ "$GERRIT_PROJECT" =~ ^(xos|xos-tosca|cord-tester|helm-charts)\$ ]]; then
              echo "No additional charts to install for testing $GERRIT_PROJECT"
+	     # ADDING TEMP SLEEP UNIL SEBA-102 resolves
+	     sleep 300
 
            else
              echo "Couldn't find a chart to test project: $GERRIT_PROJECT!"
diff --git a/jjb/pipeline/chart-api-test-helm.groovy b/jjb/pipeline/chart-api-test-helm.groovy
index a019a33..a9463f4 100644
--- a/jjb/pipeline/chart-api-test-helm.groovy
+++ b/jjb/pipeline/chart-api-test-helm.groovy
@@ -137,6 +137,8 @@
 
            elif [[ "$GERRIT_PROJECT" =~ ^(xos|xos-tosca|cord-tester|helm-charts)\$ ]]; then
              echo "No additional charts to install for testing $GERRIT_PROJECT"
+             # ADDING TEMP SLEEP UNIL SEBA-102 resolves
+	     sleep 300
 
            else
              echo "Couldn't find a chart to test project: $GERRIT_PROJECT!"
@@ -144,7 +146,7 @@
            fi
 
            # wait for services to load - TEMP SLEEP
-           sleep 300
+           ./scripts/wait_for_jobs.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
diff --git a/jjb/pipeline/xos-synchronizer-update.groovy b/jjb/pipeline/xos-synchronizer-update.groovy
index f55d0b0..5a08c96 100644
--- a/jjb/pipeline/xos-synchronizer-update.groovy
+++ b/jjb/pipeline/xos-synchronizer-update.groovy
@@ -253,6 +253,8 @@
 
            elif [[ "$GERRIT_PROJECT" =~ ^(xos|xos-tosca|cord-tester|helm-charts)\$ ]]; then
              echo "No additional charts to install for testing $GERRIT_PROJECT"
+             # ADDING TEMP SLEEP UNIL SEBA-102 resolves
+	     sleep 300
 
            else
              echo "Couldn't find a chart to test project: $GERRIT_PROJECT!"