diff --git a/jenkins/nightly-21/release-companion.sh b/jenkins/nightly-21/release-companion.sh
index 241f9ad1d..bd225009f 100755
--- a/jenkins/nightly-21/release-companion.sh
+++ b/jenkins/nightly-21/release-companion.sh
@@ -31,7 +31,7 @@ chmod -Rf g+w . || true
 
 # request companion compilation on Windows
 cd ${DESTDIR}
-wget -qO- http://winbox.open-tx.org/companion-builds/compile.php?branch=${branch}\&suffix=${OPENTX_VERSION_SUFFIX}
+wget -qO- http://winbox.open-tx.org/companion-builds/compile21.php?branch=${branch}\&suffix=${OPENTX_VERSION_SUFFIX}
 wget -O companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
 mv $DIR/opentx/companion/companion.stamp ./companion-windows.stamp
 
diff --git a/jenkins/nightly-22/release-companion.sh b/jenkins/nightly-22/release-companion.sh
index 2086fede4..092f5a4c2 100755
--- a/jenkins/nightly-22/release-companion.sh
+++ b/jenkins/nightly-22/release-companion.sh
@@ -24,16 +24,16 @@ mkdir -p $_
 cd $_
 cmake -DPCB=TARANIS ../opentx
 make package
-cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}
-
-make stamp
-chmod -Rf g+w . || true
+cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}/linux
+chmod -Rf g+w ${DESTDIR}/linux/companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm
 
 # request companion compilation on Windows
 cd ${DESTDIR}
-wget -qO- http://winbox.open-tx.org/companion-builds/compile.php?branch=${branch}\&suffix=${OPENTX_VERSION_SUFFIX}
-wget -O companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
-mv $DIR/opentx/companion/companion.stamp ./companion-windows.stamp
+wget -qO- http://winbox.open-tx.org/companion-builds/compile22.php?branch=${branch}\&suffix=${OPENTX_VERSION_SUFFIX}
+wget -O windows/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
+chmod -Rf g+w windows/companion-windows-${release}${OPENTX_VERSION_SUFFIX}.exe
 
-chmod -Rf g+w . || true
+# update windows stamp
+cp $DIR/companion-build/version.h ./companion-windows.stamp
+chmod -Rf g+w ./companion-windows.stamp 
 
diff --git a/jenkins/release-20/release-all.sh b/jenkins/release-20/release-all.sh
index 6ea8ac253..7b55b195e 100755
--- a/jenkins/release-20/release-all.sh
+++ b/jenkins/release-20/release-all.sh
@@ -4,7 +4,7 @@
 set -e
 
 # make sure we are in the good directory
-cd ~opentx/release/
+cd ~opentx/release-20/
 
 # release all components
 ./release-companion.sh
diff --git a/jenkins/release-20/release-companion.sh b/jenkins/release-20/release-companion.sh
index cf263b8b0..aa78822dc 100755
--- a/jenkins/release-20/release-companion.sh
+++ b/jenkins/release-20/release-companion.sh
@@ -4,7 +4,7 @@
 set -e
 
 # make sure we are in the good directory
-cd ~opentx/release/
+cd ~opentx/release-20/
 
 # pull the latest changes
 ./update-repo.sh
@@ -15,17 +15,21 @@ line=`grep "VERSION = " Makefile`
 version=`expr "$line" : 'VERSION = \([0-9]\..*\)'`
 
 # create companion rpm
-cd ~opentx/release/companion-build/
+rm -rf ~opentx/release-20/companion-build/
+mkdir -p $_
+cd $_
+cmake ../opentx/companion/src
 make package
+
 cp ./companion-$version-i686.rpm /var/www/html/downloads-20/companion/
 make stamp
 chmod -Rf g+w . || true
 
 # request companion compilation on Windows
 cd /var/www/html/downloads-20/companion/
-wget -qO- http://winbox.open-tx.org/companion-builds/compile.php?branch=2.0
+wget -qO- http://winbox.open-tx.org/companion-builds/compile20.php?branch=2.0
 wget -O companionInstall_$version.exe http://winbox.open-tx.org/companion-builds/companionInstall_$version.exe
-mv ~opentx/release/opentx/companion/companion.stamp ./companion-windows.stamp
+mv ~opentx/release-20/opentx/companion/companion.stamp ./companion-windows.stamp
 
 chmod -Rf g+w . || true
 
diff --git a/jenkins/release-20/release-firmware.sh b/jenkins/release-20/release-firmware.sh
index 62f944343..6c0ea15d9 100755
--- a/jenkins/release-20/release-firmware.sh
+++ b/jenkins/release-20/release-firmware.sh
@@ -4,7 +4,7 @@
 set -e
 
 # make sure we are in the good directory
-cd ~opentx/release/
+cd ~opentx/release-20/
 
 # pull the latest changes
 ./update-repo.sh
@@ -20,7 +20,7 @@ cd ../../..
 tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
 
 # copy the stamp and the release-notes to the http server
-cd ~opentx/release/
+cd ~opentx/release-20/
 cp opentx/radio/src/stamp-opentx.txt /var/www/html/downloads-20/firmware/
 cp opentx/radio/releasenotes.txt /var/www/html/downloads-20/firmware/
 cp opentx/radio/src/lua_fields.txt /var/www/html/downloads-20/firmware/
diff --git a/jenkins/release-20/release-lua.sh b/jenkins/release-20/release-lua.sh
index dd8ad067b..d22b1a61b 100755
--- a/jenkins/release-20/release-lua.sh
+++ b/jenkins/release-20/release-lua.sh
@@ -4,7 +4,7 @@
 set -e
 
 # make sure we are in the good directory
-cd ~opentx/release/
+cd ~opentx/release-20/
 
 # pull the latest changes
 ./update-repo.sh
diff --git a/jenkins/release-20/update-repo.sh b/jenkins/release-20/update-repo.sh
index c8db2ad24..0d4c7d618 100755
--- a/jenkins/release-20/update-repo.sh
+++ b/jenkins/release-20/update-repo.sh
@@ -4,7 +4,7 @@
 set -e
 
 # make sure we are in the good directory
-cd ~opentx/release/
+cd ~opentx/release-20/
 
 # pull the latest changes
 cd opentx
diff --git a/jenkins/release-21/release-companion.sh b/jenkins/release-21/release-companion.sh
index bc3b55337..ab7524eb3 100755
--- a/jenkins/release-21/release-companion.sh
+++ b/jenkins/release-21/release-companion.sh
@@ -28,7 +28,7 @@ chmod -Rf g+w . || true
 
 # request companion compilation on Windows
 cd /var/www/html/downloads-$version/companion/
-wget -qO- http://winbox.open-tx.org/companion-builds/compile.php?branch=$branch
+wget -qO- http://winbox.open-tx.org/companion-builds/compile21.php?branch=$branch
 wget -O companion-windows-$release.exe http://winbox.open-tx.org/companion-builds/companion-windows-$release.exe
 mv ~opentx/release-$version/opentx/companion/companion.stamp ./companion-windows.stamp