diff --git a/.travis.yml b/.travis.yml
index 5e4c34e8..c679b488 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ jobs:
     stage: "Build"
     env:
     - CROSS_COMPILE=mingw32
-    - CONTAINER=cross
+    - CONTAINER=archlinux
     - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-mingw32"
     before_install: .travis/before_install_mingw.sh
     install: .travis/install_mingw.sh
@@ -48,7 +48,7 @@ jobs:
   - name: "Windows mingw64"
     env:
     - CROSS_COMPILE=mingw64
-    - CONTAINER=cross
+    - CONTAINER=archlinux
     - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-mingw64"
     before_install: .travis/before_install_mingw.sh
     install: .travis/install_mingw.sh
diff --git a/.travis/before_install_mingw.sh b/.travis/before_install_mingw.sh
index 7431f4e9..069f5929 100755
--- a/.travis/before_install_mingw.sh
+++ b/.travis/before_install_mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+. .travis/docker_container.sh
 
 buildenv bash -c "echo Hello from container" # ensure to start the container
 docker cp "$container":/etc/pacman.conf pacman.conf
diff --git a/.travis/mingw_container.sh b/.travis/docker_container.sh
similarity index 92%
rename from .travis/mingw_container.sh
rename to .travis/docker_container.sh
index 5629657f..baf178f9 100755
--- a/.travis/mingw_container.sh
+++ b/.travis/docker_container.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 buildenv() {
-  setup_container archlinux
+  setup_container "$CONTAINER"
   docker exec -w "$(pwd)" -i -t "$container" "$@"
 }
 
diff --git a/.travis/install_mingw.sh b/.travis/install_mingw.sh
index 593c7de8..746332ad 100755
--- a/.travis/install_mingw.sh
+++ b/.travis/install_mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+. .travis/docker_container.sh
 
 buildenv pacman -Sqy --noconfirm
 buildenv pacman -Sq --noconfirm base-devel wget mingw-w64-cmake mingw-w64-gcc mingw-w64-pkg-config mingw-w64-libsndfile
diff --git a/.travis/no_container.sh b/.travis/no_container.sh
new file mode 100755
index 00000000..528915f2
--- /dev/null
+++ b/.travis/no_container.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+buildenv() {
+  "$@"
+}
diff --git a/.travis/prepare_tarball.sh b/.travis/prepare_tarball.sh
index 9e7e79ce..001e235f 100755
--- a/.travis/prepare_tarball.sh
+++ b/.travis/prepare_tarball.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+
+if ! [ -z "$CONTAINER" ]; then
+  . .travis/docker_container.sh
+else
+  . .travis/no_container.sh
+fi
 
 # Do not prepare a tarball without a tag
 if [[ ${TRAVIS_TAG} == "" ]]; then
diff --git a/.travis/script_mingw.sh b/.travis/script_mingw.sh
index f8a0e833..2aa9d25d 100755
--- a/.travis/script_mingw.sh
+++ b/.travis/script_mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -ex
-. .travis/mingw_container.sh
+. .travis/docker_container.sh
 
 mkdir -p build/${INSTALL_DIR} && cd build
 if [[ ${CROSS_COMPILE} == "mingw32" ]]; then