diff --git a/files/slave_scripts/gerrit-git-prep.sh b/files/slave_scripts/gerrit-git-prep.sh
index d1d1210..615ff8a 100755
--- a/files/slave_scripts/gerrit-git-prep.sh
+++ b/files/slave_scripts/gerrit-git-prep.sh
@@ -1,17 +1,17 @@
 #!/bin/bash -e
 
-REVIEW_SITE=$1
-GIT_SITE=$2
+GERRIT_SITE=$1
+ZUUL_SITE=$2
 
-if [ -z "$REVIEW_SITE" ]
+if [ -z "$GERRIT_SITE" ]
 then
-  echo "The git site name (eg 'https://review.openstack.org') must be the first argument."
+  echo "The gerrit site name (eg 'https://review.openstack.org') must be the first argument."
   exit 1
 fi
 
-if [ -z "$GIT_SITE" ]
+if [ -z "$ZUUL_SITE" ]
 then
-  echo "The git site name (eg 'http://zuul.openstack.org') must be the second argument."
+  echo "The zuul site name (eg 'http://zuul.openstack.org') must be the second argument."
   exit 1
 fi
 
@@ -23,21 +23,22 @@ fi
 
 if [ ! -z "$ZUUL_CHANGE" ]
 then
-    echo "Triggered by: $REVIEW_SITE/$ZUUL_CHANGE"
+    echo "Triggered by: $GERRIT_SITE/$ZUUL_CHANGE"
 fi
 
 set -x
 if [[ ! -e .git ]]
 then
-    git clone $GIT_SITE/p/$ZUUL_PROJECT .
+    git clone $GERRIT_SITE/p/$ZUUL_PROJECT .
 fi
+git remote set-url origin $GERRIT_SITE/p/$ZUUL_PROJECT
 git remote update || git remote update # attempt to work around bug #925790
 git reset --hard
 git clean -x -f -d -q
 
 if [ -z "$ZUUL_NEWREV" ]
 then
-    git fetch $GIT_SITE/p/$ZUUL_PROJECT $ZUUL_REF
+    git fetch $ZUUL_SITE/p/$ZUUL_PROJECT $ZUUL_REF
     git checkout FETCH_HEAD
     git reset --hard FETCH_HEAD
     git clean -x -f -d -q