diff --git a/deploy.sh b/deploy.sh
index 24c0c77..449e6c4 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -36,7 +36,7 @@ if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
 fi
 
 if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
-	PROXY_TYPE=smarthost-proxy" "$PROXY_TYPE;
+	PROXY_TYPE=$PROXY_TYPE" "smarthost-proxy;
 fi
 
 # INSTALL CORE DNS
@@ -48,6 +48,7 @@ if [ "$CORE_DNS" == "" ]; then
 fi
 
 install_core_dns() {
+
 	cp -rv /tmp/$CORE_DNS/*.json $SERVICE_DIR/ ;
 
 	DNS_VOLUMES=$(jq -r .containers[].VOLUMES[].SOURCE $SERVICE_DIR/$CORE_DNS.json |grep -v '\.')
@@ -55,38 +56,35 @@ install_core_dns() {
 		mkdir -p $VOLUME;
 	done
 
-	DNS_VOLUMES=$(jq -r --arg DEST "/etc/dnsmasq" '.containers[0].VOLUMES[] | select(.DEST | startswith($DEST))' $SERVICE_DIR/$CORE_DNS.json)       
+	DNS_VOLUMES=$(jq -r --arg DEST "/etc/dnsmasq" '.containers[0].VOLUMES[] | select(.DEST | startswith($DEST))' $SERVICE_DIR/$CORE_DNS.json)
 	DNS_DIR=$(echo $DNS_VOLUMES | jq -r .SOURCE)                                                                                           
 
 	mkdir -p $DNS_DIR;
 	cp -rv /tmp/$CORE_DNS/dns.conf $DNS_DIR/ ;
+
+	if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
+		EXISTS=$(grep -E ' publicloadbalancer| publicbackend-1| publicbackend-2' $DNS_DIR/hosts.local);
+		if [ -z "$EXISTS" ]; then
+			echo '172.18.100.2 publicloadbalancer
+172.18.101.2 publicbackend-1
+172.18.102.2 publicbackend-2' >> $DNS_DIR/hosts.local
+		fi;
+	fi;
+
+	if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
+		EXISTS=$(grep -E ' letsencrypt| smarthostloadbalancer| smarthostbackend-1| smarthostbackend-2' $DNS_DIR/hosts.local);
+		if [ -z "$EXISTS" ]; then
+			echo '172.18.254.254 letsencrypt
+172.18.103.2 smarthostloadbalancer
+172.18.104.2 smarthostbackend-1
+172.18.105.2 smarthostbackend-2' >> $DNS_DIR/hosts.local
+		fi;
+	fi
+
 }
 
 git clone ssh://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS
 
-if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
-	EXISTS=$(grep -E ' publicloadbalancer| publicbackend-1| publicbackend-2' $DNS_DIR/hosts.local);
-	if [ -z "$EXISTS" ]; then
-		echo '
-172.18.100.2 publicloadbalancer
-172.18.101.2 publicbackend-1
-172.18.102.2 publicbackend-2
-	' >> $DNS_DIR/hosts.local
-	fi;
-fi;
-
-if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
-	EXISTS=$(grep -E ' letsencrypt| smarthostloadbalancer| smarthostbackend-1| smarthostbackend-2' $DNS_DIR/hosts.local);
-	if [ -z "$EXISTS" ]; then
-		echo '
-172.18.254.254 letsencrypt
-172.18.103.2 smarthostloadbalancer
-172.18.104.2 smarthostbackend-1
-172.18.105.2 smarthostbackend-2
-		' >> $DNS_DIR/hosts.local
-	fi;
-fi
-
 # INSTALL PROXY SERVICES
 
 for i in $(echo $PROXY_TYPE); do
@@ -113,9 +111,12 @@ for i in $(echo $PROXY_TYPE); do
 	PROXY_SERVICE_FILE=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_SERVICE_FILE /tmp/$i/proxy_config)
 	SERVICE_DIR=$(jq -r .containers[0].VOLUMES[].SOURCE /tmp/$i/$PROXY_SCHEDULER_FILE |grep $PROXY_SERVICE_FILE | sed s/$PROXY_SERVICE_FILE//g)
 
-	PROXY_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR /tmp/$i/proxy_config)                                                    
-        PROXY_VOLUME=$(jq -r --arg DEST "$PROXY_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE)       
-        PROXY_DIR=$(echo $PROXY_VOLUME | jq -r .SOURCE)                                                                                           
+	PROXY_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR /tmp/$i/proxy_config)
+	if [ "$PROXY_CONFIG_DIR" == "null" ]; then
+		echo "$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR doesn't exists in /tmp/$i/proxy_config";
+	fi;
+	PROXY_VOLUME=$(jq -r --arg DEST "$PROXY_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE)       
+	PROXY_DIR=$(echo $PROXY_VOLUME | jq -r .SOURCE)
         PROXY_DIR=$(dirname $PROXY_DIR | sed s/$i//g)
 
 	DOMAIN_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.DOMAIN_DIR /tmp/$i/proxy_config)