diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 454432079..eb767efb1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,6 @@ on:
       - master
       - stable
       - develop
-      - test_build_arm64
     tags:
   release:
     types: [published]
diff --git a/build_helpers/publish_docker_arm64.sh b/build_helpers/publish_docker_arm64.sh
index 710e3065b..981b559c3 100755
--- a/build_helpers/publish_docker_arm64.sh
+++ b/build_helpers/publish_docker_arm64.sh
@@ -55,7 +55,7 @@ docker images
 docker push ${CACHE_IMAGE}:$TAG_PLOT_ARM
 docker push ${CACHE_IMAGE}:$TAG_ARM
 
-# Create multiarch image
+# Create multi-arch image
 # Make sure that all images contained here are pushed to github first.
 # Otherwise installation might fail.
 echo "create manifests"
@@ -63,14 +63,13 @@ echo "create manifests"
 docker manifest create --amend ${IMAGE_NAME}:${TAG} ${CACHE_IMAGE}:${TAG_ARM} ${IMAGE_NAME}:${TAG_PI} ${CACHE_IMAGE}:${TAG}
 docker manifest push -p ${IMAGE_NAME}:${TAG}
 
-
 docker manifest create --amend ${IMAGE_NAME}:${TAG_PLOT} ${CACHE_IMAGE}:${TAG_PLOT_ARM} ${CACHE_IMAGE}:${TAG_PLOT}
 docker manifest push -p ${IMAGE_NAME}:${TAG_PLOT}
 
 Tag as latest for develop builds
 if [ "${TAG}" = "develop" ]; then
-    docker manifest create --amend ${IMAGE_NAME}:latest ${CACHE_IMAGE}:${TAG_ARM} ${IMAGE_NAME}:${TAG_PI} ${CACHE_IMAGE}:${TAG}
-    docker manifest push -p ${IMAGE_NAME}:latest
+    docker tag ${IMAGE_NAME}:develop ${IMAGE_NAME}:latest
+    docker push ${IMAGE_NAME}:latest
 fi
 
 docker images
diff --git a/build_helpers/publish_docker_multi.sh b/build_helpers/publish_docker_multi.sh
index f2c6079ff..4961cb9a7 100755
--- a/build_helpers/publish_docker_multi.sh
+++ b/build_helpers/publish_docker_multi.sh
@@ -10,7 +10,7 @@ TAG_PI="${TAG}_pi"
 PI_PLATFORM="linux/arm/v7"
 echo "Running for ${TAG}"
 CACHE_IMAGE=freqtradeorg/freqtrade_cache
-CACHE_TAG=${CACHE_IMAGE}:${TAG}_cache
+CACHE_TAG=${CACHE_IMAGE}:${TAG_PI}_cache
 
 # Add commit and commit_message to docker container
 echo "${GITHUB_SHA}" > freqtrade_commit