diff --git a/bazel/devbuild/BUILD.bazel b/bazel/devbuild/BUILD.bazel
index 7ee46cd10..0f93fb44b 100644
--- a/bazel/devbuild/BUILD.bazel
+++ b/bazel/devbuild/BUILD.bazel
@@ -12,8 +12,8 @@ sh_template(
     substitutions = {
         "@@BASE_LIB@@": "$(rootpath //bazel/ci:base_lib)",
         "@@BOOTSTRAPPER@@": "$(rootpath //bootstrapper/cmd/bootstrapper)",
-        "@@CLI@@": "$(rootpath //cli:cli_oss_host)",
         "@@CDBG@@": "$(rootpath //debugd/cmd/cdbg:cdbg_host)",
+        "@@CLI@@": "$(rootpath //cli:cli_oss_host)",
         "@@UPGRADE_AGENT@@": "$(rootpath //upgrade-agent/cmd)",
     },
     template = "prepare_developer_workspace.sh.in",
diff --git a/bazel/devbuild/prepare_developer_workspace.sh.in b/bazel/devbuild/prepare_developer_workspace.sh.in
index 933fe5db7..0f73858a7 100755
--- a/bazel/devbuild/prepare_developer_workspace.sh.in
+++ b/bazel/devbuild/prepare_developer_workspace.sh.in
@@ -17,10 +17,10 @@ fi
 
 cd "${BUILD_WORKING_DIRECTORY}" || exit 1
 
-if [[ $# -eq 0 ]] ; then
-    workdir="."
+if [[ $# -eq 0 ]]; then
+  workdir="."
 else
-    workdir="$1"
+  workdir="$1"
 fi
 
 ln -sf "${bootstrapper}" "${workdir}/bootstrapper"