diff --git a/.deploy/docker/build-amd64.sh b/.deploy/docker/build-amd64.sh
index f00a2c12d2..51425e09f3 100755
--- a/.deploy/docker/build-amd64.sh
+++ b/.deploy/docker/build-amd64.sh
@@ -18,30 +18,3 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
     docker push jc5x/firefly-iii:latest-amd64
     docker push jc5x/firefly-iii:release-$VERSION-amd64
 fi
-
-# Then build ARM image (not 64 bits)
-
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
-# get qemu-arm-static binary
-mkdir tmp
-pushd tmp && \
-curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz && \
-tar xzf qemu-arm-static.tar.gz && \
-popd
-
-if [ "$TRAVIS_BRANCH" == "develop" ]; then
-    echo "Build develop arm"
-    docker build --tag jc5x/firefly-iii:develop-arm --file Dockerfile.arm .
-    docker tag jc5x/firefly-iii:develop-arm jc5x/firefly-iii:develop-$VERSION-arm
-    docker push jc5x/firefly-iii:develop-arm
-    docker push jc5x/firefly-iii:develop-$VERSION-arm
-fi
-
-if [ "$TRAVIS_BRANCH" == "master" ]; then
-    echo "Build master arm"
-    docker build --tag jc5x/firefly-iii:latest-arm --file Dockerfile.arm .
-    docker tag jc5x/firefly-iii:latest-arm jc5x/firefly-iii:release-$VERSION-arm
-    docker push jc5x/firefly-iii:latest-arm
-    docker push jc5x/firefly-iii:release-$VERSION-arm
-fi
\ No newline at end of file
diff --git a/.deploy/docker/build-arm.sh b/.deploy/docker/build-arm.sh
index 75206eddc8..4ea42d38e9 100755
--- a/.deploy/docker/build-arm.sh
+++ b/.deploy/docker/build-arm.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# file is currently unused.
-
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
 
 # get qemu-arm-static binary
diff --git a/.deploy/docker/manifest.sh b/.deploy/docker/manifest.sh
index f67bf4792f..c3c911a310 100755
--- a/.deploy/docker/manifest.sh
+++ b/.deploy/docker/manifest.sh
@@ -2,12 +2,10 @@
 
 if [ "$TRAVIS_BRANCH" == "develop" ]; then
     TARGET=jc5x/firefly-iii:develop
-    ARM=jc5x/firefly-iii:develop-arm
-    AMD=jc5x/firefly-iii:develop-amd64
+    IMAGENAME=jc5x/firefly-iii:develop-$ARCH
 
-    docker manifest create $TARGET $AMD $ARM
-    docker manifest annotate $TARGET $ARM --arch arm   --os linux
-    docker manifest annotate $TARGET $AMD --arch amd64 --os linux
+    docker manifest create $TARGET $IMAGENAME
+    docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
     docker manifest push $TARGET
 fi
 
@@ -15,21 +13,18 @@ echo "The version is $VERSION"
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
     TARGET=jc5x/firefly-iii:latest
-    ARM=jc5x/firefly-iii:latest-arm
-    AMD=jc5x/firefly-iii:latest-amd64
+    IMAGENAME=jc5x/firefly-iii:latest-$ARCH
 
-    docker manifest create $TARGET $AMD $ARM
-    docker manifest annotate $TARGET $ARM --arch arm   --os linux
-    docker manifest annotate $TARGET $AMD --arch amd64 --os linux
+
+    docker manifest create $TARGET $IMAGENAME
+    docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
     docker manifest push $TARGET
 
     # and another one for version specific:
     TARGET=jc5x/firefly-iii:release-$VERSION
-    ARM=jc5x/firefly-iii:release-$VERSION-arm
-    AMD=jc5x/firefly-iii:release-$VERSION-amd64
+    IMAGENAME=jc5x/firefly-iii:release-$VERSION-$ARCH
 
-    docker manifest create $TARGET $AMD $ARM
-    docker manifest annotate $TARGET $ARM --arch arm   --os linux
-    docker manifest annotate $TARGET $AMD --arch amd64 --os linux
+    docker manifest create $TARGET $IMAGENAME
+    docker manifest annotate $TARGET $IMAGENAME --arch $ARCH --os linux
     docker manifest push $TARGET
 fi