diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 41886b0e..e308bef1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -186,8 +186,9 @@ _make_pip_dependencies() {
     # shellcheck disable=SC2064
     trap "rm -rf '${tmpdir}'" EXIT;
 
-    eval "$(rapids-list-repos "${OPTS[@]}")";
-
+    if [ -z "${SKIP_RAPIDS_AGGREGATE_PIP_INDEXES}" ]; then
+        eval "$(rapids-list-repos "${OPTS[@]}")";
+    fi
     readarray -t pip_reqs_txts < <(_generate_requirements_txts);
 
     if test ${#requirement[@]} -gt 0 || test ${#pip_reqs_txts[@]} -gt 0; then
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
index 0b87cd51..67571108 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
@@ -39,6 +39,8 @@ init_gitlab_cli() {
         || echo "Continuing without logging into GitLab";
     fi
 
+    glab config set git_protocol --host "${GITLAB_HOST:-gitlab.com}" ${GIT_PROTOCOL:-ssh};
+
     local gitlab_user="${GITLAB_USER:-}";
 
     if [ -z "${gitlab_user:-}" ]; then