diff --git a/.travis.yml b/.travis.yml
index f5f9fbf..40ac436 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,26 @@ stages:
 
 jobs:
   include:
-  - name: "Compile golang binaries inside a container image"
+  - name: build-linux-amd64
     stage: build
-    script: make container-run/all
-  # - name: "Test golang binaries inside a container image"
+    script: make container-run/bin/linux/amd64/dhdu
+
+  - name: build-linux-arm5
+    stage: build
+    script: make container-run/bin/linux/arm/5/dhdu
+
+  - name: build-linux-arm7
+    stage: build
+    script: make container-run/bin/linux/arm/7/dhdu
+
+  # - name: test-linux-amd64
   #   stage: test
-  #   script: make container-run/test
+  #   script: make container-run/test/unit
   #   after_script: bash <(curl -s https://codecov.io/bash)
-  - name: "Deploy container-image tagged as latest"
+
+  - name: deploy-container-amd64
     stage: deploy
-    script: make container-image/push
-  - name: "Deploy container-image tagged with a git tag"
-    stage: deploy
-    script: make container-image/push VERSION=${TRAVIS_TAG} CONTAINER_IMAGE_VERSION=${TRAVIS_TAG}
-    on:
-      tags: true
+    script: make container-image/push/amd64
 
 notifications:
   email: