diff --git a/.travis.yml b/.travis.yml
index b5ec5482fad4..ba88c0537810 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,30 @@ before_install:
 # Don't build on tags because we'll already have built the commit.
 jobs:
   include:
-    - name: "Linux build"
+    - name: "Linux build - x86_64"
       os: linux
-      dist: trusty
+      arch: amd64
+      dist: precise
       env: TARGET="linux" PUSH_DOCKER="true"
       if: tag IS blank
       script: scripts/ci.bash
-    - name: "Alpine build"
+    - name: "Alpine build - x86_64"
+      os: linux
+      arch: amd64
+      dist: trusty
+      env: TARGET="alpine"
+      if: tag IS blank
+      script: scripts/ci.bash
+    - name: "Linux build - ARM"
+      os: linux
+      arch: arm64
+      dist: xenial
+      env: TARGET="linux"
+      if: tag IS blank
+      script: scripts/ci.bash
+    - name: "Alpine build - ARM"
       os: linux
+      arch: arm64
       dist: trusty
       env: TARGET="alpine"
       if: tag IS blank
diff --git a/scripts/ci.bash b/scripts/ci.bash
index 96aff3aee5b7..ec78237982c4 100755
--- a/scripts/ci.bash
+++ b/scripts/ci.bash
@@ -60,6 +60,7 @@ function main() {
 	local vscodeVersion="${VSCODE_VERSION:-}"
 	local ostype="${OSTYPE:-}"
 	local package="${PACKAGE:-}"
+    local target="${TARGET:-}"
 
 	if [[ -z "${codeServerVersion}" ]] ; then
 		>&2 echo "Must set VERSION environment variable"; exit 1
@@ -69,7 +70,7 @@ function main() {
 		>&2 echo "Must set VSCODE_VERSION environment variable"; exit 1
 	fi
 
-	if [[ "${ostype}" == "darwin"* ]]; then
+	if [[ "${ostype}" == "darwin"* || "${target}" == "linux" ]]; then
 		local-build
 	else
 		docker-build