diff --git a/tools/nightly22/build-nightly.sh b/tools/nightly22/build-nightly.sh
index c3656804f..20e35685a 100755
--- a/tools/nightly22/build-nightly.sh
+++ b/tools/nightly22/build-nightly.sh
@@ -27,15 +27,15 @@ docker rmi -f new-${docker}
 code/tools/nightly22/build-sdcard.sh
 
 # Build Linux companion
+docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
+docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
+docker exec companion rm -rf build
 if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
-  docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
-  docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
-  docker exec companion rm -rf build
   docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/ ${suffix}
-  docker stop companion
-  docker rm companion
   cp -f  binaries/*.deb ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb
 fi
+docker stop companion
+docker rm companion
 
 # Request companion compilation on Windows
 if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then
diff --git a/tools/release22/build-release.sh b/tools/release22/build-release.sh
index e58a14dc6..efafeb8ea 100755
--- a/tools/release22/build-release.sh
+++ b/tools/release22/build-release.sh
@@ -21,16 +21,16 @@ docker rmi -f new-${docker}
 code/tools/release22/build-sdcard.sh
 
 # Build Linux companion
+docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
+docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
+docker exec companion rm -rf build
 if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
-  docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
-  docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
-  docker exec companion rm -rf build
   docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/
-  docker stop companion
-  docker rm companion
   cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}_amd64.deb
   cp -f binaries/radio/src/lua/lua_fields_*.txt ${output}/firmware
 fi
+docker stop companion
+docker rm companion
 
 # Request companion compilation on Windows
 if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then