diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75844a5ea..239576c61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,6 @@ on:
       - master
       - develop
       - github_actions_tests
-      - rpi_crosscompile
     tags:
     release:
       types: [published]
diff --git a/build_helpers/publish_docker_pi.sh b/build_helpers/publish_docker_pi.sh
index 20513f045..060b1deaf 100755
--- a/build_helpers/publish_docker_pi.sh
+++ b/build_helpers/publish_docker_pi.sh
@@ -6,7 +6,7 @@
 TAG=$(echo "${BRANCH_NAME}" | sed -e "s/\//_/g")
 PI_PLATFORM="linux/arm/v7"
 echo "Running for ${TAG}"
-CACHE_TAG=${IMAGE_NAME}:${TAG}_cache
+CACHE_TAG=freqtradeorg/freqtrade_cache:${TAG}_cache
 
 # Add commit and commit_message to docker container
 echo "${GITHUB_SHA}" > freqtrade_commit