diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 73c9d536fc..d7f8f09661 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -257,7 +257,7 @@ jobs:
         id: cache
         with:
           path: ./build/linux-${{ matrix.arch_name }}/third_party/install
-          key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-3
+          key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-4
       - name: disable superbuild on cache hit
         if: steps.cache.outputs.cache-hit == 'true'
         run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/linux-${{ matrix.arch_name }}/third_party/install" >> $GITHUB_ENV
diff --git a/docker/Dockerfile.dockcross-linux-arm64-custom b/docker/Dockerfile.dockcross-linux-arm64-custom
index 5f3ce5de31..4f4c788008 100644
--- a/docker/Dockerfile.dockcross-linux-arm64-custom
+++ b/docker/Dockerfile.dockcross-linux-arm64-custom
@@ -1,6 +1,6 @@
 FROM dockcross/linux-arm64-lts
 
-ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-arm64-custom
+ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-arm64-custom
 
 RUN apt install rubygems -y
 RUN gem install fpm
diff --git a/docker/Dockerfile.dockcross-linux-armv6-custom b/docker/Dockerfile.dockcross-linux-armv6-custom
index db45725640..e11a0cb492 100644
--- a/docker/Dockerfile.dockcross-linux-armv6-custom
+++ b/docker/Dockerfile.dockcross-linux-armv6-custom
@@ -1,6 +1,6 @@
 FROM dockcross/linux-armv6-lts
 
-ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-armv6-custom
+ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv6-custom
 
 RUN apt install rubygems -y
 RUN gem install fpm
diff --git a/docker/Dockerfile.dockcross-linux-armv7-custom b/docker/Dockerfile.dockcross-linux-armv7-custom
index 4b5d3b54b6..909f981766 100644
--- a/docker/Dockerfile.dockcross-linux-armv7-custom
+++ b/docker/Dockerfile.dockcross-linux-armv7-custom
@@ -1,6 +1,6 @@
 FROM dockcross/linux-armv7-lts
 
-ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-armv7-custom
+ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv7-custom
 
 RUN apt install rubygems -y
 RUN gem install fpm