diff --git a/install.sh b/install.sh
index a110e28..5bbcbbe 100755
--- a/install.sh
+++ b/install.sh
@@ -42,6 +42,9 @@ ask_envs() {
 		echo "Please add a valid vpn hash key:";
 		while read -r VPN_HASH; do
         	        if [ "$VPN_HASH" != "" ]; then
+				$SUDO_CMD mkdir -p /etc/user/secret/vpn-proxy;
+				echo $VPN_HASH | base64 -d > /tmp/wg0.conf;
+				$SUDO_CMD mv /tmp/wg0.conf /etc/user/secret/vpn-proxy/;
         	                break;
         	        fi;
 		done
@@ -140,12 +143,6 @@ check_dirs_and_files() {
  registry.format.hu/setup'";
 	} > $HOME/.bash_aliases
 
-	if [ "$VPN_HASH" != "" ]; then
-		$SUDO_CMD mkdir -p /etc/user/secret/vpn-proxy;
-		echo $VPN_HASH | base64 -d > /tmp/wg0.conf;
-		$SUDO_CMD mv /tmp/wg0.conf /etc/user/secret/vpn-proxy/;
-	fi
-
 }
 
 check_running() {
@@ -305,20 +302,58 @@ ask_envs;
 
 $SUDO_CMD docker pull registry.format.hu/installer-tool
 
+# Validating previously created vaiables
+
+if [ "$SMARTHOST_PROXY" != "" ]; then
+	VAR_SMARTHOST_PROXY="--env SMARTHOST_PROXY=$SMARTHOST_PROXY";
+fi
+
+if [ "$LOCAL_PROXY" != "" ]; then
+	VAR_LOCAL_PROXY="--env LOCAL_PROXY=$LOCAL_PROXY";
+fi
+
+if [ "$VPN_PROXY" != "" ]; then
+	VAR_VPN_PROXY="--env VPN_PROXY=$VPN_PROXY";
+fi
+
+if [ "$DOMAIN" != "" ]; then
+	VAR_DOMAIN="--env DOMAIN=$DOMAIN";
+fi
+
+if [ "$CRON" != "" ]; then
+	VAR_CRON="--env CRON=$CRON";
+fi
+
+if [ "$DISCOVERY" != "" ]; then
+	VAR_DISCOVERY="--env DISCOVERY=$DISCOVERY";
+fi
+
+if [ "$DISCOVERY_DIR" != "" ]; then
+	VAR_DISCOVERY_DIR="--env DISCOVERY_DIR=$DISCOVERY_DIR";
+	VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/";
+fi
+
+if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then
+	VAR_DISCOVERY_CONFIG_FILE="--env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE";
+	VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIRECTORY/";
+fi
+
+# Run installer tool
+
 $SUDO_CMD docker run \
+$VAR_SMARTHOST_PROXY \
+$VAR_LOCAL_PROXY \
+$VAR_VPN_PROXY \
+$VAR_DOMAIN \
+$VAR_CRON \
+$VAR_DISCOVERY \
+$VAR_DISCOVERY_DIR \
+$VAR_DISCOVERY_DIRECTORY \
+$VAR_DISCOVERY_CONFIG_FILE \
+$VAR_DISCOVERY_CONFIG_DIRECTORY \
 --volume $HOME/.ssh/installer:/root/.ssh/id_rsa \
---env SMARTHOST_PROXY=$SMARTHOST_PROXY \
---env LOCAL_PROXY=$LOCAL_PROXY \
---env VPN_PROXY=$VPN_PROXY \
---env CRON=$CRON \
---env DOMAIN=$DOMAIN \
---env DISCOVERY=$DISCOVERY \
---env DISCOVERY_DIR=$DISCOVERY_DIR \
---env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE \
 --volume /etc/user/:/etc/user/ \
 --volume /etc/system/:/etc/system/ \
---volume $DISCOVERY_DIR/:$DISCOVERY_DIR/ \
---volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/ \
 --env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL registry.format.hu/installer-tool