diff --git a/jenkins/nightly-21/release-firmware.sh b/jenkins/nightly-21/release-firmware.sh
index 5e9a87e7c..7969a41d8 100755
--- a/jenkins/nightly-21/release-firmware.sh
+++ b/jenkins/nightly-21/release-firmware.sh
@@ -6,7 +6,7 @@ set -x
 
 # make sure we are in the good directory
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd $DIR
+cd ${DIR}
 
 # pull the latest changes
 ./update-repo.sh
diff --git a/jenkins/nightly-22/release-all.sh b/jenkins/nightly-22/release-all.sh
index 94d998480..a32c0f3f4 100755
--- a/jenkins/nightly-22/release-all.sh
+++ b/jenkins/nightly-22/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-22/release-companion.sh b/jenkins/nightly-22/release-companion.sh
index 092f5a4c2..1c9fefa38 100755
--- a/jenkins/nightly-22/release-companion.sh
+++ b/jenkins/nightly-22/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/
+rm -rf   ${DIR}/companion-build/
 mkdir -p $_
-cd $_
+cd       $_
 cmake -DPCB=TARANIS ../opentx
 make package
 cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}/linux
diff --git a/jenkins/nightly-22/release-firmware.sh b/jenkins/nightly-22/release-firmware.sh
index 853aea492..b82dd617a 100755
--- a/jenkins/nightly-22/release-firmware.sh
+++ b/jenkins/nightly-22/release-firmware.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
+
 # make the stamp
 cd opentx/radio/src
 make clean
@@ -25,16 +27,18 @@ tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
 cd opentx/radio/src
 make lua/lua_exports_taranis.inc lua/lua_exports_taranis_x9e.inc lua/lua_exports_horus.inc lua/lua_exports_flamenco.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.h /var/www/html/downloads-$version/nightly/firmware/stamp-opentx.txt
-cp opentx/radio/releasenotes.txt /var/www/html/downloads-$version/nightly/firmware/
-cp opentx/radio/src/lua/lua_fields_*.txt /var/www/html/downloads-$version/nightly/firmware/
-echo ${OPENTX_VERSION_SUFFIX} > /var/www/html/downloads-$version/nightly/firmware/suffix.txt
+cp opentx/radio/src/stamp.h              ${DESTDIR}/stamp-opentx.txt
+cp opentx/radio/releasenotes.txt         ${DESTDIR}
+cp opentx/radio/src/lua/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-22/release-lua.sh b/jenkins/nightly-22/release-lua.sh
deleted file mode 100755
index 7baf5179f..000000000
--- a/jenkins/nightly-22/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-22/release-voices.sh b/jenkins/nightly-22/release-voices.sh
deleted file mode 100755
index b3915961f..000000000
--- a/jenkins/nightly-22/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
-