diff --git a/.travis.yml b/.travis.yml
index f1e8b717..b3a70852 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,6 +71,8 @@ jobs:
         - docker-compose run ${TARGET}
     - <<: *run-additional-jobs
       env: TARGET=android
+    - <<: *run-additional-jobs
+      env: TARGET=examples
     - <<: *run-additional-jobs
       env: TARGET=sonar-scan
     - <<: *run-additional-jobs
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3726f6e8..87ff0ca7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '2.1'
 services:
 
   base:
-    image: inteliotdevkit/upm-base
+    image: inteliotdevkit/upm-base:move-examples-to-addition-jobs
     environment:
       - http_proxy
       - https_proxy
@@ -14,7 +14,7 @@ services:
       - BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF}
       - BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF}
       - BUILDSWIGNODE=${BUILDSWIGNODE:-OFF}
-      - BUILDEXAMPLES=${BUILDEXAMPLES:-ON}
+      - BUILDEXAMPLES=${BUILDEXAMPLES:-OFF}
       - IPK=${IPK:-OFF}
       - RPM=${RPM:-OFF}
       - NPM=${NPM:-OFF}
@@ -28,7 +28,7 @@ services:
 
   all:
     extends: base
-    image: inteliotdevkit/upm-all
+    image: inteliotdevkit/upm-all:move-examples-to-addition-jobs
 
   doc:
     extends: all
@@ -39,6 +39,15 @@ services:
       - BUILDDOC=ON
     command: bash -c "./scripts/run-cmake.sh && ./scripts/build-doc.sh"
 
+  examples:
+    extends: all
+    environment:
+      - BUILDSWIGPYTHON=ON
+      - BUILDSWIGJAVA=ON
+      - BUILDSWIGNODE=ON
+      - BUILDEXAMPLES=ON
+    command: bash -c "./scripts/run-cmake.sh && cd build && make -j8"
+
   ipk:
     extends: all
     environment:
@@ -66,7 +75,7 @@ services:
       - BUILDSWIGPYTHON=ON
       - BUILDSWIGNODE=ON
       - BUILDSWIGJAVA=ON
-      - BUILDSWIGEXAMPLES=ON
+      - BUILDEXAMPLES=ON
       - SONAR_TOKEN
       - SONAR_ORG
       - SONAR_PROJ_KEY
@@ -79,36 +88,36 @@ services:
 
   python:
     extends: base
-    image: inteliotdevkit/upm-python
+    image: inteliotdevkit/upm-python:move-examples-to-addition-jobs
     environment:
       - BUILDSWIGPYTHON=ON
     command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8 install && ldconfig && ctest --output-on-failure"
 
   java:
     extends: base
-    image: inteliotdevkit/upm-java
+    image: inteliotdevkit/upm-java:move-examples-to-addition-jobs
     environment:
       - BUILDSWIGJAVA=ON
     command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8 install && ldconfig && ctest --output-on-failure"
 
   android:
     extends: java
-    image: inteliotdevkit/upm-android
+    image: inteliotdevkit/upm-android:move-examples-to-addition-jobs
     environment:
       - BUILDTESTS=OFF
     command: bash -c "./scripts/build-android.sh"
 
   node4:
     extends: base
-    image: inteliotdevkit/upm-node4
+    image: inteliotdevkit/upm-node4:move-examples-to-addition-jobs
     environment:
       - BUILDSWIGNODE=ON
     command: bash -c "./scripts/run-cmake.sh && cd build && make -j8 && make -j8 install && ldconfig && ctest --output-on-failure -E examplenames_js"
 
   node5:
     extends: node4
-    image: inteliotdevkit/upm-node5
+    image: inteliotdevkit/upm-node5:move-examples-to-addition-jobs
 
   node6:
     extends: node4
-    image: inteliotdevkit/upm-node6
+    image: inteliotdevkit/upm-node6:move-examples-to-addition-jobs
diff --git a/scripts/run-cmake.sh b/scripts/run-cmake.sh
index 66c65bf1..85161205 100755
--- a/scripts/run-cmake.sh
+++ b/scripts/run-cmake.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+set -x
+set -e
+
 # Run cmake
 cmake \
   -DSWIG_EXECUTABLE=/usr/bin/swig \