diff --git a/jenkins/nightly-21/release-all.sh b/jenkins/nightly-21/release-all.sh
index 94d998480..a32c0f3f4 100755
--- a/jenkins/nightly-21/release-all.sh
+++ b/jenkins/nightly-21/release-all.sh
@@ -6,12 +6,10 @@ set -x
 
 # make sure we are in the good directory
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
+cd ${DIR}
 source ./version.sh
 
 # release all components
 ./release-companion.sh
-#./release-voices.sh
-#./release-lua.sh
 ./release-firmware.sh
 
diff --git a/jenkins/nightly-21/release-companion.sh b/jenkins/nightly-21/release-companion.sh
index bd225009f..ba3b78af5 100755
--- a/jenkins/nightly-21/release-companion.sh
+++ b/jenkins/nightly-21/release-companion.sh
@@ -6,12 +6,14 @@ set -x
 
 # make sure we are in the good directory
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
-source ./version.sh
+cd ${DIR}
 
 # pull the latest changes
 ./update-repo.sh
 
+# retrieve release after the repo update
+source ./version.sh
+
 DESTDIR=/var/www/html/downloads-${version}/nightly/companion
 
 # clean radio source
@@ -19,9 +21,9 @@ cd opentx/radio/src
 make clean
 
 # create companion rpm
-rm -rf $DIR/companion-build/
-mkdir -p $DIR/companion-build/
-cd $DIR/companion-build/
+rm -rf ${DIR}/companion-build/
+mkdir -p ${DIR}/companion-build/
+cd ${DIR}/companion-build/
 cmake ../opentx/companion/src
 make package
 cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}
@@ -33,7 +35,7 @@ chmod -Rf g+w . || true
 cd ${DESTDIR}
 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
+mv ${DIR}/opentx/companion/companion.stamp ./companion-windows.stamp
 
 chmod -Rf g+w . || true
 
diff --git a/jenkins/nightly-21/release-firmware.sh b/jenkins/nightly-21/release-firmware.sh
index fecd26180..64b31a9d0 100755
--- a/jenkins/nightly-21/release-firmware.sh
+++ b/jenkins/nightly-21/release-firmware.sh
@@ -25,16 +25,18 @@ tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
 cd opentx/radio/src
 make lua_exports_taranis.inc lua_exports_taranis_x9e.inc
 
+DESTDIR=/var/www/html/downloads-${version}/nightly/firmware
+
 # copy the stamp and the release-notes to the http server
-cd $DIR
-cp opentx/radio/src/stamp-opentx.txt /var/www/html/downloads-$version/nightly/firmware/
-cp opentx/radio/releasenotes.txt /var/www/html/downloads-$version/nightly/firmware/
-cp opentx/radio/src/lua_fields_*.txt /var/www/html/downloads-$version/nightly/firmware/
-echo ${OPENTX_VERSION_SUFFIX} > /var/www/html/downloads-$version/nightly/firmware/suffix.txt
+cd ${DIR}
+cp opentx/radio/src/stamp-opentx.txt ${DESTDIR}
+cp opentx/radio/releasenotes.txt ${DESTDIR}
+cp opentx/radio/src/lua_fields_*.txt ${DESTDIR}
+echo ${OPENTX_VERSION_SUFFIX} > ${DESTDIR}/suffix.txt
 
 # erase all previous builds
-rm -f /var/www/html/downloads-$version/nightly/firmware/binaries/opentx*.hex
-rm -f /var/www/html/downloads-$version/nightly/firmware/binaries/opentx*.bin
+rm -f ${DESTDIR}/binaries/opentx*.hex
+rm -f ${DESTDIR}/binaries/opentx*.bin
 
 # clean the sources
 cd opentx/radio/src
diff --git a/jenkins/nightly-21/release-lua.sh b/jenkins/nightly-21/release-lua.sh
deleted file mode 100755
index 7baf5179f..000000000
--- a/jenkins/nightly-21/release-lua.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-# make sure we are in the good directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
-source ./version.sh
-
-# pull the latest changes
-./update-repo.sh
-
-# make the stamp
-cd opentx/radio/wizard/
-zip -r /var/www/html/lua-$version/wizard.zip *.lua *.bmp
-
diff --git a/jenkins/nightly-21/release-voices.sh b/jenkins/nightly-21/release-voices.sh
deleted file mode 100755
index b3915961f..000000000
--- a/jenkins/nightly-21/release-voices.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# stops on first error
-set -e
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
-
-# get voice packs
-wget -O /dev/null $winboxurl/compile.php?branch=$branch
-cd /var/www/html/voices-$version/opentx-taranis/en/
-wget -O english-irish-taranis.zip $winboxurl/english-irish-taranis.zip
-wget -O english-scottish-taranis.zip $winboxurl/english-scottish-taranis.zip
-wget -O english-american-taranis.zip $winboxurl/english-american-taranis.zip
-wget -O english-australian-taranis.zip $winboxurl/english-australian-taranis.zip
-wget -O english-taranis.csv $winboxurl/english-irish-taranis.csv
-cd /var/www/html/voices-$version/opentx-taranis/fr/
-wget -O french-taranis.zip $winboxurl/french-taranis.zip
-wget -O french-taranis.csv $winboxurl/french-taranis.csv
-
diff --git a/jenkins/release-21/release-all.sh b/jenkins/release-21/release-all.sh
index 4a897889e..4ab1fb02e 100755
--- a/jenkins/release-21/release-all.sh
+++ b/jenkins/release-21/release-all.sh
@@ -2,12 +2,12 @@
 
 # stops on first error
 set -e
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
+set -x
 
 # make sure we are in the good directory
-cd ~opentx/release-$version/
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd ${DIR}
+source ./version.sh
 
 # release all components
 ./release-companion.sh
diff --git a/jenkins/release-21/release-companion.sh b/jenkins/release-21/release-companion.sh
index ab7524eb3..ffde1ed76 100755
--- a/jenkins/release-21/release-companion.sh
+++ b/jenkins/release-21/release-companion.sh
@@ -2,35 +2,39 @@
 
 # stops on first error
 set -e
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
+set -x
 
 # make sure we are in the good directory
-cd ~opentx/release-$version/
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd ${DIR}
 
 # pull the latest changes
 ./update-repo.sh
 
+# retrieve release after the repo update
+source ./version.sh
+
+DESTDIR=/var/www/html/downloads-${version}/companion
+
 # clean radio source
 cd opentx/radio/src
 make clean
 
 # create companion rpm
-rm -rf ~opentx/release-$version/companion-build/
-mkdir -p ~opentx/release-$version/companion-build/
-cd ~opentx/release-$version/companion-build/
+rm -rf   ${DIR}/companion-build/
+mkdir -p ${DIR}/companion-build/
+cd       ${DIR}/companion-build/
 cmake ../opentx/companion/src
 make package
-cp ./companion${version}-$release-i686.rpm /var/www/html/downloads-$version/companion/
+cp ./companion${version}-${release}-i686.rpm ${DESTDIR}
 make stamp
 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/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
+cd ${DESTDIR}
+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 ${DIR}/opentx/companion/companion.stamp ./companion-windows.stamp
 
 chmod -Rf g+w . || true
 
diff --git a/jenkins/release-21/release-firmware.sh b/jenkins/release-21/release-firmware.sh
index 107ad07a5..582a974dc 100755
--- a/jenkins/release-21/release-firmware.sh
+++ b/jenkins/release-21/release-firmware.sh
@@ -2,12 +2,12 @@
 
 # stops on first error
 set -e
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
+set -x
 
 # make sure we are in the good directory
-cd ~opentx/release-$version/
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd $DIR
+source ./version.sh
 
 # pull the latest changes
 ./update-repo.sh
@@ -25,15 +25,17 @@ tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
 cd opentx/radio/src
 make lua_exports_taranis.inc lua_exports_taranis_x9e.inc
 
+DESTDIR=/var/www/html/downloads-${version}/firmware
+
 # copy the stamp and the release-notes to the http server
-cd ~opentx/release-$version/
-cp opentx/radio/src/stamp-opentx.txt /var/www/html/downloads-$version/firmware/
-cp opentx/radio/releasenotes.txt /var/www/html/downloads-$version/firmware/
-cp opentx/radio/src/lua_fields_*.txt /var/www/html/downloads-$version/firmware/
+cd ${DIR}
+cp opentx/radio/src/stamp-opentx.txt ${DESTDIR}
+cp opentx/radio/releasenotes.txt     ${DESTDIR}
+cp opentx/radio/src/lua_fields_*.txt ${DESTDIR}
 
 # erase all previous builds
-rm -f /var/www/html/downloads-$version/firmware/binaries/opentx*.hex
-rm -f /var/www/html/downloads-$version/firmware/binaries/opentx*.bin
+rm -f ${DESTDIR}/binaries/opentx*.hex
+rm -f ${DESTDIR}/binaries/opentx*.bin
 
 # clean the sources
 cd opentx/radio/src
diff --git a/jenkins/release-21/release-lua.sh b/jenkins/release-21/release-lua.sh
index 44fcd4131..f015318c4 100755
--- a/jenkins/release-21/release-lua.sh
+++ b/jenkins/release-21/release-lua.sh
@@ -2,17 +2,19 @@
 
 # stops on first error
 set -e
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
+set -x
 
 # make sure we are in the good directory
-cd ~opentx/release-$version/
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd ${DIR}
 
 # pull the latest changes
 ./update-repo.sh
 
-# make the stamp
+# retrieve release after the repo update
+source ./version.sh
+
+# release wizard
 cd opentx/radio/wizard/
-zip -r /var/www/html/lua-$version/wizard.zip *.lua *.bmp
+zip -r /var/www/html/lua-${version}/wizard.zip *.lua *.bmp
 
diff --git a/jenkins/release-21/release-voices.sh b/jenkins/release-21/release-voices.sh
index 9bf998b21..8249b2243 100755
--- a/jenkins/release-21/release-voices.sh
+++ b/jenkins/release-21/release-voices.sh
@@ -2,19 +2,26 @@
 
 # stops on first error
 set -e
+set -x
 
+# make sure we are in the good directory
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
+cd ${DIR}
+
+# retrieve release after the repo update
+source ./version.sh
+
+# build voice packs
+wget -O /dev/null ${winboxurl}/compile.php?branch=${branch}
 
 # get voice packs
-wget -O /dev/null $winboxurl/compile.php?branch=$branch
-cd /var/www/html/voices-$version/opentx-taranis/en/
-wget -O english-irish-taranis.zip $winboxurl/english-irish-taranis.zip
-wget -O english-scottish-taranis.zip $winboxurl/english-scottish-taranis.zip
-wget -O english-american-taranis.zip $winboxurl/english-american-taranis.zip
-wget -O english-australian-taranis.zip $winboxurl/english-australian-taranis.zip
-# wget -O english-taranis.csv $winboxurl/english-irish-taranis.csv # doesn't seem to work
-cd /var/www/html/voices-$version/opentx-taranis/fr/
-wget -O french-taranis.zip $winboxurl/french-taranis.zip
-# wget -O french-taranis.csv $winboxurl/french-taranis.csv #outdated
+cd /var/www/html/voices-${version}/opentx-taranis/en/
+wget -O english-irish-taranis.zip      ${winboxurl}/english-irish-taranis.zip
+wget -O english-scottish-taranis.zip   ${winboxurl}/english-scottish-taranis.zip
+wget -O english-american-taranis.zip   ${winboxurl}/english-american-taranis.zip
+wget -O english-australian-taranis.zip ${winboxurl}/english-australian-taranis.zip
+# wget -O english-taranis.csv ${winboxurl}/english-irish-taranis.csv # doesn't seem to work
 
+cd /var/www/html/voices-${version}/opentx-taranis/fr/
+wget -O french-taranis.zip             ${winboxurl}/french-taranis.zip
+# wget -O french-taranis.csv ${winboxurl}/french-taranis.csv #outdated
diff --git a/jenkins/release-21/update-repo.sh b/jenkins/release-21/update-repo.sh
index 282db52cf..c27b46673 100755
--- a/jenkins/release-21/update-repo.sh
+++ b/jenkins/release-21/update-repo.sh
@@ -2,12 +2,12 @@
 
 # stops on first error
 set -e
-
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/version.sh
+set -x
 
 # make sure we are in the good directory
-cd ~opentx/release-$version/
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+cd $DIR
+source ./version.sh
 
 # pull the latest changes
 cd opentx