diff --git a/run/scripts/selfupdate b/run/scripts/selfupdate
index 38e022627a5116bb03dd81a599c592f9036f9742..9c6be233ebeb0a28254f59c117d2e00056d697db 100755
--- a/run/scripts/selfupdate
+++ b/run/scripts/selfupdate
@@ -11,15 +11,14 @@ if [[ "$NEWVERSION" == "" ]]; then
   exit
 fi
 
-export L3DVERSION=${NEWVERSION}
 echo "Loading new version ..."
-UPDATE=$(docker run -v ${SCRIPTPATH}:/setup --rm registry.lakedrops.com/docker/l3d/setup:${L3DVERSION} 2>&1)
-if [[ "$UPDATE" == *"setup:${L3DVERSION} not found"* ]]; then
-  echo "Version ${L3DVERSION} not found."
+UPDATE=$(docker run -v ${SCRIPTPATH}:/setup --rm registry.lakedrops.com/docker/l3d/setup:${NEWVERSION} 2>&1)
+if [[ "$UPDATE" == *"setup:${NEWVERSION} not found"* ]]; then
+  echo "Version ${NEWVERSION} not found."
   exit
 fi
 
-echo "Self update to version ${L3DVERSION} succeeded!"
+echo "Self update to version ${NEWVERSION} succeeded!"
 echo ""
 echo ""
 echo ""
@@ -36,5 +35,6 @@ echo ""
 echo ""
 echo ""
 
+export L3DVERSION=${NEWVERSION}
 export L3D_FORCE_UPDATE=0
 /usr/local/bin/reset
diff --git a/setup/scripts/setup b/setup/scripts/setup
index d219c48dd96e2601ba3fe5d5d1a3702dac320ae4..b37fb38733eb604e3661d73db9f9c0baa75f103d 100755
--- a/setup/scripts/setup
+++ b/setup/scripts/setup
@@ -2,8 +2,8 @@
 
 cp /usr/local/bin/l3d /setup/l3d
 cp /usr/local/bin/prepareMac4L3d /setup/prepareMac4L3d
-if [[ -z ${L3DVERSION} ]]; then
-  docker pull registry.lakedrops.com/docker/l3d/run:${L3DVERSION} 2>&1
+if [[ -z ${NEWVERSION} ]]; then
+  docker pull registry.lakedrops.com/docker/l3d/run:${NEWVERSION} 2>&1
 else
   docker pull registry.lakedrops.com/docker/l3d/run:latest 2>&1
 fi