diff --git a/tools/rc22/build-rc.sh b/tools/rc22/build-rc.sh
index afbb7105a6..9411b9f28b 100755
--- a/tools/rc22/build-rc.sh
+++ b/tools/rc22/build-rc.sh
@@ -34,7 +34,7 @@ docker exec companion rm -rf build
 if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
   docker exec companion /opentx/code/tools/build-companion-release.sh /opentx/code /opentx/binaries/
   docker exec companion sh -c "cp /build/radio/src/lua/*.txt /opentx/binaries"
-  cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}_amd64.deb
+  cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb
   cp -f binaries/lua_fields_*.txt ${output}/firmware
 fi
 docker stop companion
diff --git a/tools/rc22/build-sdcard.sh b/tools/rc22/build-sdcard.sh
index 1b63f8acf1..60f19a7eba 100644
--- a/tools/rc22/build-sdcard.sh
+++ b/tools/rc22/build-sdcard.sh
@@ -52,8 +52,8 @@ else
   mkdir ${workdir}/sdcard/taranis-x7/SOUNDS
   cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x9/
   cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x7/
-  cd ${workdir}/sdcard/horus && zip -r ${output}/x12/sdcard-horus-${sdcard_version}.zip *
-  cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/x9/sdcard-taranis-x9-${sdcard_version}.zip *
-  cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/x7/sdcard-taranis-x7-${sdcard_version}.zip *
+  cd ${workdir}/sdcard/horus && zip -r ${output}/opentx-x12s/sdcard-horus-${sdcard_version}.zip *
+  cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/opentx-x9d/sdcard-taranis-x9-${sdcard_version}.zip *
+  cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/opentx-x7/sdcard-taranis-x7-${sdcard_version}.zip *
   rm -Rf ${workdir}/sdcard
 fi