diff --git a/.deploy/docker/build-amd64.sh b/.deploy/docker/build-amd64.sh
new file mode 100755
index 0000000000..36a7e80f77
--- /dev/null
+++ b/.deploy/docker/build-amd64.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# build image
+docker build -t jc5x/ff-test-builds:develop -f Dockerfile .
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+
+if [ "$TRAVIS_BRANCH" == "develop" ]; then
+    docker push jc5x/firefly-iii:develop
+fi
+
+if [ "$TRAVIS_BRANCH" == "master" ]; then
+    docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
+    docker push jc5x/firefly-iii:latest
+    docker push jc5x/firefly-iii:release-$VERSION
+fi
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index cd7136ad47..e1defd5e09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,9 @@ services:
   - docker
 
 script:
-  - .deploy/docker/build-arm.sh
\ No newline at end of file
+  - .deploy/docker/build-arm.sh
+  - .deploy/docker/build-amd64.sh
+  - docker manifest create jc5x/ff-test-builds jc5x/firefly-iii:develop jc5x/firefly-iii:develop-arm
+  - docker manifest annotate jc5x/ff-test-builds jc5x/firefly-iii:develop-arm --arch arm   --os linux
+  - docker manifest annotate jc5x/ff-test-builds jc5x/firefly-iii:develop     --arch amd64 --os linux
+  - docker manifest push jc5x/ff-test-builds