diff --git a/Base/files/base_entrypoint.sh b/Base/files/base_entrypoint.sh
index daaa28305a13fb70ec4b5f1e36919daa785abfc2..b30e0fd3f5d41a57d4ff0d408e3321de25d42623 100644
--- a/Base/files/base_entrypoint.sh
+++ b/Base/files/base_entrypoint.sh
@@ -6,14 +6,17 @@ set -e
 
 
 if [ "x$SAFE_MODE" == "xTrue" ]; then
+
     echo ""
     echo "[INFO] Not executing entrypoint as we are in safe mode, just opening a Bash shell."
     exec /bin/bash
+
 else
+
 	echo ""
 	echo "[INFO] Executing entrypoint..."
-	
 
+		
     #---------------------
     #   Setup home
     #---------------------
@@ -29,7 +32,7 @@ else
             if [ -e "$x" ]; then cp -a "$x" /home/metauser/; fi
         done
 		
-	# Mark as initialized
+	    # Mark as initialized
 	    touch /home/metauser/.initialized
 	fi
 	
@@ -37,7 +40,8 @@ else
 	echo "[INFO] Setting up HOME env var"
 	export HOME=/home/metauser
 	cd /home/metauser
-	
+
+		
     #---------------------
     #   Save env
     #---------------------
@@ -55,7 +59,17 @@ else
 	      echo "export $env_var" >> /tmp/env.sh
 	  fi
 	done
-	
+
+		
+    #---------------------
+    #   Storage link
+    #---------------------	
+    if [ -e "/storages" ]; then
+	    echo "[INFO] Creating link from /home/metauser/storages to /storages."
+	    ln -s /storages /home/metauser/storages
+    fi
+
+
     #---------------------
     #   Prompt
     #---------------------