diff --git a/common-jobs-bitbucket.sh b/common-jobs-bitbucket.sh
index bdd4222c..ed54c588 100644
--- a/common-jobs-bitbucket.sh
+++ b/common-jobs-bitbucket.sh
@@ -12,6 +12,7 @@ export  SUBDOMAIN=`echo $URL_DOMAIN | awk -F. '{print $1}'`
 export  APP=`echo $URL_DOMAIN | awk -F[.-] '{print $3}'`
 export  NAMESPACE=$APP-web
 export  REPO=$BITBUCKET_REPO_SLUG
+export REPLACE=`echo $NEW_URL | awk -F[./] '{print $4"."$5}'`
 
 # ---------------------------
 echo "export  SUBDOMAIN=`echo $URL_DOMAIN | awk -F. '{print $1}'`" >> setenv.sh 
@@ -19,6 +20,7 @@ echo "export  NEW_URL=https://$URL_DOMAIN" >> setenv.sh
 echo "export  APP=`echo $URL_DOMAIN | awk -F[.-] '{print $3}'`" >> setenv.sh
 echo "export  NAMESPACE=$APP-web" >> setenv.sh
 echo "export  REPO=$BITBUCKET_REPO_SLUG" >> setenv.sh
+echo "export  REPLACE=`echo $NEW_URL | awk -F[./] '{print $4"."$5}'`" >> setenv.sh
 # ---------------------------------------------------------------
 echo "JOBNAME 			-- $JOBNAME"
 echo "ENV     			-- $ENV" 
@@ -30,8 +32,8 @@ echo "SUBDOMAIN 		-- $SUBDOMAIN"
 echo "VERSION 		  	-- $VERSION"
 echo "RESTORE_VERSION 	-- $RESTORE_VERSION"
 echo "DB_NAME 			-- $DB_NAME"
-echo "MYSQL_FILE_NAME 			-- $MYSQL_FILE_NAME"
-echo "STATIC_FILE_NAME 			-- $STATIC_FILE_NAME"
+echo "MYSQL_FILE_NAME 	-- $MYSQL_FILE_NAME"
+echo "STATIC_FILE_NAME 	-- $STATIC_FILE_NAME"
 
 cat ./setenv.sh
 # -------------------------------------------------------------------------------------------------------------------------
@@ -50,7 +52,7 @@ kubectl cp wp  $NAMESPACE/common-job-pod:/tmp && echo "wp copy to /tmp done" ||
 kubectl cp setenv.sh  $NAMESPACE/common-job-pod:/tmp/setenv.sh && echo "setenv copy done" || exit 9
 kubectl exec common-job-pod -n $NAMESPACE -- sh -c 'chmod 755 /tmp/setenv.sh'
 kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh ; cp -rf  /tmp/wp/* /usr/share/nginx/subdomain/$SUBDOMAIN/'
-echo  $URL_DOMAIN | grep  www && echo "maindomain $URL_DOMAIN" || kubectl delete po common-job-pod -n $NAMESPACE
+echo  $SUBDOMAIN | grep  www && echo "maindomain $URL_DOMAIN" || kubectl delete po common-job-pod -n $NAMESPACE
 
 ;;
 
@@ -125,8 +127,11 @@ kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; export FIL
 
 
 kubectl exec common-job-pod -n $NAMESPACE -- sh -c 'wget https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar ; chmod u+x wp-cli.phar;mv wp-cli.phar /usr/local/bin/wp; php /usr/local/bin/wp  --info'
-kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; OLD_URL=`wp option get siteurl --allow-root --path=/usr/share/nginx/subdomain/$SUBDOMAIN`; echo "export OLD_URL=$OLD_URL" >>  /tmp/setenv.sh'
-kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; wp search-replace --allow-root --path=/usr/share/nginx/subdomain/$SUBDOMAIN "$OLD_URL" "$NEW_URL"'
+
+
+kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; OLD_URL=`wp option get siteurl --allow-root --path=/usr/share/nginx/subdomain/$SUBDOMAIN`; echo "export OLD_URL=$OLD_URL" >> /tmp/setenv.sh; echo "export FIND=$(echo $OLD_URL|cut -d. -f2,3)" >> /tmp/setenv.sh'
+
+kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; wp search-replace --allow-root --path=/usr/share/nginx/subdomain/$SUBDOMAIN "$FIND" "$REPLACE" --all-tables'
 
 kubectl delete po common-job-pod -n $NAMESPACE