diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 231cec5..d69347e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,42 @@
-stages:
-  - build
-
+#stages:
+#  - build
+#
 #cache:
 #  paths:
 #    - .piolibdeps
+#
+#build-examples:
+#  stage: build
+#  image: registry.gitlab.com/wirelos/contraption-pipeline/platformio:v1
+#  script:
+#    - pio upgrade
+#    - platformio lib --global install painlessMesh ArduinoJson TaskScheduler PubSubClient ESPAsyncTCP AsyncTCP "ESP Async WebServer"
+#    - platformio ci --lib="." --board=esp12e src/examples/basic/
+#    - platformio ci --lib="." --board=esp12e src/examples/mesh/
+#    - platformio ci --lib="." --board=esp12e src/examples/mqttBridge/
 
-build-examples:
+image: python:2.7-stretch
+
+# This folder is cached between builds
+# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
+cache:
+  paths:
+    - firmware
+
+stages:
+  - test
+  - build
+
+before_script:
+  - "pip install -U platformio"
+
+firmware-build:
   stage: build
-  image: registry.gitlab.com/wirelos/contraption-pipeline/platformio:v1
+  image: python:2.7-stretch
   script:
-    - pio upgrade
-    - platformio lib --global install painlessMesh ArduinoJson TaskScheduler PubSubClient ESPAsyncTCP AsyncTCP "ESP Async WebServer"
-    - platformio ci --lib="." --board=esp12e src/examples/basic/
-    - platformio ci --lib="." --board=esp12e src/examples/mesh/
-    - platformio ci --lib="." --board=esp12e src/examples/mqttBridge/
\ No newline at end of file
+    - pio run -t clean
+    - pio run
+  artifacts:
+    paths:
+      - .pioenvs/*/firmware.*
+      - .pioenvs/*/spiffs.bin