diff --git a/.travis.yml b/.travis.yml
index 0f71b7a..3e48542 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,43 @@ services:
 
 jobs:
   include:
-  - stage: build
-    script: make container-run/all
-  # Disabled (Missing postgres db)
-  # - stage: test
-  #   script: make container-run/test/unit
-  - stage: test
+  - name: build-darwin-386
+    stage: build
+    script: make container-run/bin/darwin/386/flucky
+
+  - name: build-darwin-amd64
+    stage: build
+    script: make container-run/bin/darwin/amd64/flucky
+
+  - name: build-freebsd-amd64
+    stage: build
+    script: make container-run/bin/freebsd/amd64/flucky
+
+  - name: build-linux-386
+    stage: build
+    script: make container-run/bin/linux/386/flucky
+
+  - name: build-linux-amd64
+    stage: build
+    script: make container-run/bin/linux/amd64/flucky
+
+  - name: build-linux-arm5
+    stage: build
+    script: make container-run/bin/linux/arm/5/flucky
+
+  - name: build-linux-arm7
+    stage: build
+    script: make container-run/bin/linux/arm/7/flucky
+
+  - name: test-linux-amd64
+    stage: test
     script: make container-run/test/unit
     after_script: bash <(curl -s https://codecov.io/bash)
-  - stage: deploy
-    script: make container-image/push
+
+  - name: deploy-container-amd64
+    stage: deploy
+    script: make container-image/push/amd64
+
 
 notifications:
   email: