diff --git a/.jenkins.sh b/.jenkins.sh
index 22ed7fcf2e3f7c2036855e04f827591d5ae7c5c0..8bfd08f3eca4a3d38f9d69241633e61be114e937 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -12,7 +12,18 @@ run_dir="$(pwd)"
 echo "Using git branch $GIT_BRANCH"
 
 bash ./scripts/build-container.sh
-bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH"
+ret=$?
+if [ "$ret" != "0" ]; then
+     echo "build-container.sh failed"
+     exit -1
+fi
+
+bash ./scripts/run-container.sh "${run_dir}"
+ret=$?
+if [ "$ret" != "0" ]; then
+     echo "run-container.sh failed"
+     exit -1
+fi
 
 if [[ "$GIT_BRANCH" =~ .*fix-plu$ ]]; then
 
@@ -30,3 +41,4 @@ fi
 ret=$?
 echo "Final validation result: $ret"
 exit $ret
+
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index bf5f18016e4e9c9175fbc6ee663c262a3e3009fd..9f082157bc7b1e5c57c486bc7d932e86f7177057 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER ETSI STF 583