diff --git a/.travis.yml b/.travis.yml
index 3f4e361..1bc82f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,4 @@ sudo: required
 services: docker
 
 script:
-  - make test-amd64
-  - make test-s3-amd64
+  - make all
diff --git a/Dockerfile b/Dockerfile
index 41e9e0c..b97df1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,9 @@ ARG REPO=library
 FROM ${REPO}/ubuntu:xenial
 LABEL maintainer="ViViDboarder <vividboarder@gmail.com>"
 
+# Allow building/running non-amd64 images from amd64
+COPY --from=multiarch/qemu-user-static:4.1.0-1 /usr/bin/qemu-* /usr/bin/
+
 RUN apt-get update \
         && apt-get install -y --no-install-recommends \
             software-properties-common python-software-properties \
diff --git a/hooks/pre_build b/hooks/pre_build
deleted file mode 100755
index e76a49a..0000000
--- a/hooks/pre_build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -ex
-
-docker run --rm --privileged multiarch/qemu-user-static:register --reset