diff --git a/.deploy/docker/build-amd64.sh b/.deploy/docker/build-amd64.sh
index 93e6707770..4a80ab83b2 100755
--- a/.deploy/docker/build-amd64.sh
+++ b/.deploy/docker/build-amd64.sh
@@ -5,14 +5,14 @@ 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
+    docker build -t jc5x/firefly-iii:develop-amd -f Dockerfile .
+    docker push jc5x/firefly-iii:develop-amd
 fi
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
     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
+    docker build -t jc5x/firefly-iii:latest-amd -f Dockerfile .
+    docker tag jc5x/firefly-iii:latest-amd jc5x/firefly-iii:release-$VERSION-amd
+    docker push jc5x/firefly-iii:latest-amd
+    docker push jc5x/firefly-iii:release-$VERSION-amd
 fi
\ No newline at end of file
diff --git a/.deploy/docker/manifest.sh b/.deploy/docker/manifest.sh
index 7877508def..7dc254cc47 100755
--- a/.deploy/docker/manifest.sh
+++ b/.deploy/docker/manifest.sh
@@ -2,7 +2,7 @@
 if [ "$TRAVIS_BRANCH" == "develop" ]; then
     TARGET=jc5x/firefly-iii:develop
     ARM=jc5x/firefly-iii:develop-arm
-    AMD=jc5x/firefly-iii:develop
+    AMD=jc5x/firefly-iii:develop-amd
 
     docker manifest create $TARGET $AMD $ARM
     docker manifest annotate $TARGET $ARM --arch arm   --os linux
@@ -15,7 +15,7 @@ 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
+    AMD=jc5x/firefly-iii:latest-amd
 
     docker manifest create $TARGET $AMD $ARM
     docker manifest annotate $TARGET $ARM --arch arm   --os linux
@@ -25,7 +25,7 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
     # 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
+    AMD=jc5x/firefly-iii:release-$VERSION-amd
 
     docker manifest create $TARGET $AMD $ARM
     docker manifest annotate $TARGET $ARM --arch arm   --os linux