diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh
index a1ea5d9..3531bb5 100755
--- a/hack/bootstrap_tfw_dev.sh
+++ b/hack/bootstrap_tfw_dev.sh
@@ -17,6 +17,8 @@ TEST=test-${TFW_POSTFIX}
 FRONTEND=frontend-${TFW_POSTFIX}
 LOGFILE=/tmp/bootstrap_tfw.log
 
+remotebase="git@github.com:"
+
 run()
 {
     trap 'exit 1' INT
@@ -91,7 +93,6 @@ clone_repos_ask_ssh_or_https()
 
 clone_repos()
 {
-    remotebase="git@github.com:"
     spinned_or_not="spinned"
     if [[ "$HTTPS_REMOTES" == "1" ]]; then
         remotebase="https://github.com/"
@@ -116,7 +117,7 @@ install_frontend_deps()
 
 fetch_latest_tag()
 {
-    echo -n "$(git ls-remote --tags git@github.com:avatao-content/${BASEIMAGE}.git |
+    echo -n "$(git ls-remote --tags ${remotebase}avatao-content/${BASEIMAGE}.git   |
                cut -f2                                                             |
                grep -oP '(?<=refs/tags/)\w+-\d{8}$'                                |
                sort -t '-' -k2                                                     |