diff --git a/lib/steps/repos.sh b/lib/steps/repos.sh
index 13df0c7..ae05f78 100644
--- a/lib/steps/repos.sh
+++ b/lib/steps/repos.sh
@@ -8,12 +8,15 @@ step_repos() {
     _clone_repos
     _setup_env
 }
-
 _clone_repos() {
     for name in core essentials cli gui; do
         local url="${REPO_URLS[$name]}"
         local branch="${REPO_BRANCHES[$name]}"
         local dest="${REPO_DIRS[$name]}"
+        [ "$name" = "core" ] && dest="$HV_CORE"   
+        [ "$name" = "cli" ] && dest="$HV_CLI"
+        [ "$name" = "essentials" ] && dest="$HV_ESSENTIALS"
+        [ "$name" = "gui" ] && dest="$HV_GUI"
 
         if [ -d "$dest/.git" ]; then
             log_warn "Repo already exists: ${dest}"