diff --git a/deploy.sh b/deploy.sh
index 92b56d1..fdd7710 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -50,17 +50,17 @@ for i in $(echo $PROXY_TYPE); do
 		PROXY_SCHEDULER_FILE=smarthost-proxy-scheduler.json
 	fi
 	
-	PROXY_SCHEDULER_NAME=$(jq -r .containers[0].NAME /tmp/$i/$PROXY_SERVICE_FILE | cut -d "-" -f1)
+	PROXY_SCHEDULER_NAME=$(jq -r .containers[0].NAME /tmp/$i/$PROXY_SCHEDULER_FILE | cut -d "-" -f1)
 	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_SERVICE_FILE |grep $PROXY_SERVICE_FILE | sed s/$PROXY_SERVICE_FILE//g)
+	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_SERVICE_FILE)       
+        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) 
-        DOMAIN_VOLUME=$(jq -r --arg DEST "$DOMAIN_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SERVICE_FILE)       
+        DOMAIN_VOLUME=$(jq -r --arg DEST "$DOMAIN_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE)       
         DOMAIN_DIR=$(echo $DOMAIN_VOLUME | jq -r .SOURCE)                                                                                           
 
 	mkdir -p $SERVICE_DIR;
@@ -119,12 +119,14 @@ for i in $(echo $PROXY_TYPE); do
 	fi
 
 	if [ "$i" == "smarthost-proxy" ]; then
-       		git clone ssh://$GIT_REPO/$ORGANIZATION/$PROXY_DNS.git /tmp/$PROXY_DNS
        		
-       		# COPY PROXY DNS FILES
+		# COPY PROXY DNS FILES
 		if [ "$PROXY_DNS" == "" ]; then 
 			PROXY_DNS=proxy-dns
 		fi
+       	
+		git clone ssh://$GIT_REPO/$ORGANIZATION/$PROXY_DNS.git /tmp/$PROXY_DNS
+       		
 	
         	DNS_VOLUMES=$(jq -r .containers[].VOLUMES[].SOURCE /tmp/$i/$PROXY_DNS.json |grep -v '\.')
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 02ad0d7..0f89f66 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -50,4 +50,4 @@ fi
 
 sh /deploy.sh
 
-echo "Successfully deployed $PUBLIC_PROXY $SMARTHOST_PROXY"
+echo "Successfully deployed $PROXY_TYPE"