diff --git a/.deploy/docker/build-amd64.sh b/.deploy/docker/build-amd64.sh
index 36a7e80f77..93e6707770 100755
--- a/.deploy/docker/build-amd64.sh
+++ b/.deploy/docker/build-amd64.sh
@@ -1,15 +1,18 @@
 #!/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
+    echo "Build develop amd64"
+    docker build -t jc5x/firefly-iii:develop -f Dockerfile .
     docker push jc5x/firefly-iii:develop
 fi
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
-    docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
+    echo "Build master amd64"
+    docker build -t jc5x/firefly-iii:latest -f Dockerfile .
+    docker tag jc5x/firefly-iii:latest jc5x/firefly-iii:release-$VERSION
     docker push jc5x/firefly-iii:latest
     docker push jc5x/firefly-iii:release-$VERSION
 fi
\ No newline at end of file
diff --git a/.deploy/docker/build-arm.sh b/.deploy/docker/build-arm.sh
index 9a702f3e76..10a76477e9 100755
--- a/.deploy/docker/build-arm.sh
+++ b/.deploy/docker/build-arm.sh
@@ -9,15 +9,18 @@ tar xzf qemu-arm-static.tar.gz && \
 popd
 
 # build image
-docker build -t jc5x/ff-test-builds:develop -f Dockerfile-ARM .
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
 if [ "$TRAVIS_BRANCH" == "develop" ]; then
+    echo "Build develop arm"
+    docker build -t jc5x/firefly-iii:develop-arm -f Dockerfile-ARM .
     docker push jc5x/firefly-iii:develop-arm
 fi
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
-    docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
+    echo "Build master arm"
+    docker build -t jc5x/firefly-iii:latest-arm -f 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