diff --git a/Dockerfile b/Dockerfile
index d1ee73e7a6d677d811ff5e3eae4e6f48341e944c..fdd96b5b764ed69b1511d355dbdb86a8a66f12fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ ADD start.sh /usr/local/bin/.start
 ADD configIdea.sh /usr/local/bin/.configIdea
 ADD l3dComposer.php /usr/local/bin/.l3dComposer.php
 ADD run/scripts/info /usr/local/bin/l3d
+ADD run/scripts/version /usr/local/bin/version
 
 RUN echo "Install dorgflow" && \
     cd /var/opt && \
diff --git a/run/Dockerfile b/run/Dockerfile
index de57d32c9c1164ac29a3493a9efdf8ce62961519..99fa403780b566c50b0973c1f616e76932519f15 100644
--- a/run/Dockerfile
+++ b/run/Dockerfile
@@ -25,6 +25,6 @@ RUN apk add bash curl jq && \
     ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
     wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
     chmod +x /usr/local/bin/docker-compose && \
-    sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/run
+    sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/l3dcurrentversion
 
 ENTRYPOINT /bin/sh
diff --git a/run/scripts/help b/run/scripts/help
index d3b794bb9e5629a18367c34fbe21dfc81214ad64..f2b8ab20fd35c602843df4c20f61958b508970b1 100755
--- a/run/scripts/help
+++ b/run/scripts/help
@@ -3,7 +3,7 @@
 echo "L3D - LakeDropsDrupalDev"
 echo "========================="
 echo ""
-echo "Version: ${VERSION}"
+echo "Version: ${L3DVERSION}"
 echo "Support: https://gitlab.lakedrops.com/docker/l3d"
 echo ""
 echo "Usage:   l3d [ help | version | selfupdate [VERSION] | update | reset | PROJECTNAME | delete PROJECTNAME ] | list"
diff --git a/run/scripts/l3dcurrentversion b/run/scripts/l3dcurrentversion
new file mode 100755
index 0000000000000000000000000000000000000000..14885ca1b6ae8b8d5eb34bb9d37c36749d30acda
--- /dev/null
+++ b/run/scripts/l3dcurrentversion
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+export L3DVERSION='{{ version }}'
diff --git a/run/scripts/l3dnewversion b/run/scripts/l3dnewversion
new file mode 100755
index 0000000000000000000000000000000000000000..a0aa0e3ca664bb22063a632d3325b6401a067e4c
--- /dev/null
+++ b/run/scripts/l3dnewversion
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
+if [[ "$NEWVERSION" == "$L3DVERSION" ]]; then
+  return
+fi
+printf "%s" $NEWVERSION
diff --git a/run/scripts/run b/run/scripts/run
index 4cff91d5e7bafdd662d13a5a9926473d66ae6ec7..191c7a15c23603ad3fcf067f569fa56e1f2f985d 100755
--- a/run/scripts/run
+++ b/run/scripts/run
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export VERSION='{{ version }}'
+/usr/local/bin/l3dcurrentversion
 
 COMMAND=start
 if [[ -n "$1" ]]; then
diff --git a/run/scripts/selfupdate b/run/scripts/selfupdate
index 33c391d5e935613bbb9fbd8e47b311551b01b65e..2d7420bfc5acf5e6b1141415839706252368d35d 100755
--- a/run/scripts/selfupdate
+++ b/run/scripts/selfupdate
@@ -3,10 +3,10 @@
 if [[ -n $1 ]]; then
   NEWVERSION=$1
 else
-  NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
+  NEWVERSION=$(/usr/local/bin/l3dcurrentversion)
 fi
 
-if [[ "$NEWVERSION" == "$VERSION" ]]; then
+if [[ "$NEWVERSION" == "" ]]; then
   echo "No new version available"
   exit
 fi
@@ -20,7 +20,7 @@ fi
 
 echo "Self update to version ${NEWVERSION} succeeded!"
 
-export VERSION=${NEWVERSION}
+export L3DVERSION=${NEWVERSION}
 export L3D_FORCE_UPDATE=0
 /usr/local/bin/reset
 
diff --git a/run/scripts/start b/run/scripts/start
index c3a32e0210221cadeec0fa1dc20c72f0782455e7..e7fd7a06bdd24bcf30ce8668e2753dcd2bf6221b 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -40,6 +40,7 @@ function startContainer {
         --hostname ${COMPOSE_PROJECT_NAME}-l3d \
         --user ${USERID}:${GROUPID} \
         --group-add ${GROUPIDS// / --group-add } \
+        --env L3DVERSION=${L3DVERSION} \
         --env L3DSHELL=${L3DSHELL} \
         --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
         --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
@@ -56,7 +57,7 @@ function startContainer {
         --volume ${HOMEDIR}:${HOMEDIR} \
         --workdir /drupal \
         --restart unless-stopped \
-        registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
+        registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION}
     fi
     docker exec -it \
       --env HOMEDIR=${HOMEDIR} \
diff --git a/run/scripts/update b/run/scripts/update
index ba662e8f9d1a470497766309cf4ae9433fb80676..4c1d4ca3772d5c16fb94091a99bc98832e9c820d 100755
--- a/run/scripts/update
+++ b/run/scripts/update
@@ -24,7 +24,7 @@ function cleanup {
       removecontainer $IMAGEID
     done
   else
-    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION} | head -1)
+    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION} | head -1)
     removecontainer $IMAGEID rmi
   fi
   docker image ls -q registry.lakedrops.com/docker/node > /tmp/reset.lst
@@ -43,7 +43,7 @@ if [[ -n ${PHP_VERSION} ]]; then
       exit
     fi
     echo "Updating the image ..."
-    STATUS=$(docker pull registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION})
+    STATUS=$(docker pull registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION})
     if [[ "$STATUS" == *"Status: Image is up to date"* ]]; then
       echo "Already up to date"
     else
diff --git a/run/scripts/version b/run/scripts/version
index 5e6c41f4f7d434ff4f508ff7629ecb41508e7adf..66ebd6c022c842cb008e7a0e09ebed7a97dc1bc9 100755
--- a/run/scripts/version
+++ b/run/scripts/version
@@ -1,12 +1,10 @@
 #!/bin/bash
 
-echo "Version: ${VERSION}"
+echo "Version: ${L3DVERSION}"
 
-NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
-if [[ "$NEWVERSION" == "$VERSION" ]]; then
-  return
+NEWVERSION=$(/usr/local/bin/l3dcurrentversion)
+if [[ "$NEWVERSION" != "" ]]; then
+  echo ""
+  echo "A new version is available: $NEWVERSION"
+  echo "      run 'l3d selfupdate'"
 fi
-
-echo ""
-echo "A new version is available: $NEWVERSION"
-echo "      run 'l3d selfupdate'"