diff --git a/.travis.yml b/.travis.yml
index d7501b49fb..3a77373427 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,20 +4,9 @@ cache: bundler
 services: docker
 before_script: mkdir debs && chmod 777 debs
 env:
-    - TRAVIS_ARCH=aarch64
-    - TRAVIS_ARCH=arm
-    - TRAVIS_ARCH=i686
-    - TRAVIS_ARCH=x86_64
+  matrix:
+    - ARGS="-i -a aarch64"
+    - ARGS="-i -a arm"
+    - ARGS="-i -a i686"
+    - ARGS="-i -a x86_64"
 script: bundle exec rake build["${ARGS}"]
-jobs:
-  include:
-    - stage: Build aarch64
-      env: ARGS="-q -a aarch64"
-    - env: ARGS="-q -i -a aarch64"
-    - stage: Build arm, i686, & x86_64
-      env: ARGS="-q -a arm"
-    - env: ARGS="-q -a i686"
-    - env: ARGS="-q -a x86_64"
-    - env: ARGS="-q -i -a arm"
-    - env: ARGS="-q -i -a i686"
-    - env: ARGS="-q -i -a x86_64"
diff --git a/Rakefile b/Rakefile
index 08764a36b2..408d0ece31 100644
--- a/Rakefile
+++ b/Rakefile
@@ -20,7 +20,7 @@ task :build, [:options] do |t, args|
     puts "Building #{pkg}"
     begin
       # Start blocking build loop
-      PTY.spawn("./scripts/run-docker.sh ./build-package.sh #{args[:options]} -a $TRAVIS_ARCH #{pkg}") do |stdout, stdin, pid|
+      PTY.spawn("./scripts/run-docker.sh ./build-package.sh #{args[:options]} #{pkg}") do |stdout, stdin, pid|
         begin
           stdout.sync
           stdout.each { |line| print line }