diff --git a/.travis.yml b/.travis.yml
index f3b9a8a..b8fb594 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ env:
   - PATH=$HOME/.local/bin:$PATH
   - AWS_BUCKET="ofxpimapper"
   - AWS_SHARED="~/shared"
+  - IMAGE="opm-${TRAVIS_TAG}.img"
 
 git:
   depth: 1
@@ -13,11 +14,11 @@ before_install:
 
 jobs:
   include:
-  - stage: addons
+  - stage: prepare
     os: linux
     dist: trusty
     sudo: required
-    env: IMAGE="opm-${TRAVIS_TAG}.img" RPI_ZIP="raspbian_lite-2017-07-05-of_v0.9.8.img.zip" RPI_URL="https://github.com/kr15h/openframeworks-rpi-image/releases/download/v1.0.2/${RPI_ZIP}"
+    env: RPI_ZIP="raspbian_lite-2017-07-05-of_v0.9.8.img.zip" RPI_URL="https://github.com/kr15h/openframeworks-rpi-image/releases/download/v1.0.2/${RPI_ZIP}"
     addons:
       apt:
         packages:
@@ -29,15 +30,14 @@ jobs:
         - dosfstools
         - zip
     script:
-    - sudo bash ./scripts/ci/rpi/addons.sh
+    - sudo bash ./scripts/ci/rpi/prepare.sh
     - zip "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}"
     - aws s3 rm "s3://${AWS_BUCKET}" --recursive
     - aws s3 sync "${AWS_SHARED}" "s3://${AWS_BUCKET}"
-  - stage: finalize pass 1
+  - stage: build pass a
     os: linux
     dist: trusty
     sudo: required
-    env: IMAGE="opm-${TRAVIS_TAG}.img"
     addons:
       apt:
         packages:
@@ -52,14 +52,13 @@ jobs:
     - aws s3 sync "s3://${AWS_BUCKET}" "${AWS_SHARED}"
     - aws s3 rm "s3://${AWS_BUCKET}" --recursive
     - mv "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}.zip"
-    - sudo bash ./scripts/ci/rpi/finalize.sh
+    - sudo bash ./scripts/ci/rpi/buid.sh
     - zip "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}"
     - aws s3 sync "${AWS_SHARED}" "s3://${AWS_BUCKET}"
-  - stage: finalize pass 2
+  - stage: build pass b
     os: linux
     dist: trusty
     sudo: required
-    env: IMAGE="opm-${TRAVIS_TAG}.img"
     addons:
       apt:
         packages:
@@ -74,7 +73,7 @@ jobs:
     - aws s3 sync "s3://${AWS_BUCKET}" "${AWS_SHARED}"
     - aws s3 rm "s3://${AWS_BUCKET}" --recursive
     - mv "${AWS_SHARED}/${IMAGE}.zip" "./${IMAGE}.zip"
-    - sudo bash ./scripts/ci/rpi/finalize.sh
+    - sudo bash ./scripts/ci/rpi/build.sh
     - zip "${IMAGE}.zip" "./${IMAGE}"
     deploy:
       provider: releases
diff --git a/scripts/ci/rpi/build-script.sh b/scripts/ci/rpi/build-script.sh
new file mode 100644
index 0000000..3aae156
--- /dev/null
+++ b/scripts/ci/rpi/build-script.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Begin build-script.sh"
+
+cd /home/pi/openFrameworks/addons/ofxPiMapper/example_basic
+timeout 30m make -j $(nproc)
+
+echo "End build-script.sh"
diff --git a/scripts/ci/rpi/finalize.sh b/scripts/ci/rpi/build.sh
similarity index 98%
rename from scripts/ci/rpi/finalize.sh
rename to scripts/ci/rpi/build.sh
index 43e0439..c11925b 100644
--- a/scripts/ci/rpi/finalize.sh
+++ b/scripts/ci/rpi/build.sh
@@ -14,7 +14,7 @@ fi
 # Image creation constants.
 # See .travis.yml for environment variables.
 MOUNT="mnt"
-SCRIPT="finalize-script.sh"
+SCRIPT="build-script.sh"
 
 # Unmount drives and general cleanup on exit, the trap ensures this will always
 # run execpt in the most extream cases.
diff --git a/scripts/ci/rpi/finalize-script.sh b/scripts/ci/rpi/finalize-script.sh
deleted file mode 100644
index 369c5ed..0000000
--- a/scripts/ci/rpi/finalize-script.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "Finalizing OPM RPi image."
-
-cd /home/pi/openFrameworks/addons/ofxPiMapper/example_basic
-timeout 25m make -j $(nproc)
-
-echo "OPM RPi image setup done!"
diff --git a/scripts/ci/rpi/addons-script.sh b/scripts/ci/rpi/prepare-script.sh
similarity index 56%
rename from scripts/ci/rpi/addons-script.sh
rename to scripts/ci/rpi/prepare-script.sh
index 59fdeed..49c5425 100644
--- a/scripts/ci/rpi/addons-script.sh
+++ b/scripts/ci/rpi/prepare-script.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 
-echo "Compiling addons."
+echo "Begin prepare-script.sh"
 
-cd /home/pi/openFrameworks/addons/ofxOMXPlayer/example-basic
-make -j $(nproc)
-
-cd /home/pi/openFrameworks/addons/ofxJSON/example_file_read_write
-make -j $(nproc)
-
-echo "Inastalling extra packages."
+echo "Installing extra packages."
 sudo apt-get -yq install usbmount dosfstools exfat-fuse exfat-utils
 
 echo "Setting hostname."
@@ -21,4 +15,4 @@ echo "@reboot /home/pi/openFrameworks/addons/ofxPiMapper/example_basic/bin/examp
 crontab mycron
 rm mycron
 
-echo "Compiling addons done!"
+echo "End prepare-script.sh"
diff --git a/scripts/ci/rpi/addons.sh b/scripts/ci/rpi/prepare.sh
similarity index 99%
rename from scripts/ci/rpi/addons.sh
rename to scripts/ci/rpi/prepare.sh
index e5d5700..14905e0 100644
--- a/scripts/ci/rpi/addons.sh
+++ b/scripts/ci/rpi/prepare.sh
@@ -14,7 +14,7 @@ fi
 # Image creation constants.
 # See .travis.yml for environment variables.
 MOUNT="mnt"
-SCRIPT="addons-script.sh"
+SCRIPT="prepare-script.sh"
 
 # Unmount drives and general cleanup on exit, the trap ensures this will always
 # run execpt in the most extream cases.