diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh
index 525b951138..a2761002ca 100755
--- a/android/KMAPro/build.sh
+++ b/android/KMAPro/build.sh
@@ -7,7 +7,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
index 9b6d0d4892..f4d7705815 100755
--- a/android/KMEA/build.sh
+++ b/android/KMEA/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # ################################ Main script ################################
 
diff --git a/android/Samples/KMSample1/build.sh b/android/Samples/KMSample1/build.sh
index 65e5619815..5893deb856 100755
--- a/android/Samples/KMSample1/build.sh
+++ b/android/Samples/KMSample1/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/android/Samples/KMSample2/build.sh b/android/Samples/KMSample2/build.sh
index 08c5261778..cc4d224477 100755
--- a/android/Samples/KMSample2/build.sh
+++ b/android/Samples/KMSample2/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/android/Tests/KeyboardHarness/build.sh b/android/Tests/KeyboardHarness/build.sh
index 66f2b0496e..1cf1d02c54 100755
--- a/android/Tests/KeyboardHarness/build.sh
+++ b/android/Tests/KeyboardHarness/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/android/build.sh b/android/build.sh
index e00c99e634..636386dc9d 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -15,7 +15,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 # shellcheck disable=SC2154
 . "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
-. "${KEYMAN_ROOT}/resources/build/build-utils-ci.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 
 ################################ Main script ################################
diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index 0c9657f74b..781c63bbec 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 ################################ Main script ################################
 
@@ -56,4 +56,4 @@ export default KEYMAN_VERSION;
 builder_run_action clean        rm -rf version.inc.ts keyman-version.mts build/
 builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
-builder_run_action publish      builder_publish_npm
+builder_run_action publish      ci_publish_npm
diff --git a/common/web/langtags/build.sh b/common/web/langtags/build.sh
index d1b951b624..4eec3d2c6a 100755
--- a/common/web/langtags/build.sh
+++ b/common/web/langtags/build.sh
@@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman langtags.js common module" \
   "clean" \
@@ -43,4 +43,4 @@ builder_run_action clean      rm -rf ./build ./src/imports ./node_modules
 builder_run_action configure  do_configure
 builder_run_action build      tsc --build
 builder_run_action test       echo 'no tests for langtags'
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 1ece69f2af..97ed5b603e 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman common file types module" \
   "@/core/include/ldml" \
@@ -105,4 +105,4 @@ builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo ./src/schem
 builder_run_action configure  do_configure
 builder_run_action build      tsc --build
 builder_run_action test       do_test
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/core/include/ldml/build.sh b/core/include/ldml/build.sh
index f2633ed348..4029d732ce 100755
--- a/core/include/ldml/build.sh
+++ b/core/include/ldml/build.sh
@@ -10,7 +10,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman ldml-keyboard-constants package" \
   "@/common/web/keyman-version" \
@@ -34,4 +34,4 @@ builder_run_action clean      rm -rf ./build/
 builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 # builder_run_action test       # no tests at this time
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/developer/src/build.sh b/developer/src/build.sh
index 6e23dc8c0a..fae0699748 100755
--- a/developer/src/build.sh
+++ b/developer/src/build.sh
@@ -6,7 +6,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe \
@@ -93,7 +93,7 @@ function do_prepublish() {
   # the global publish
   #
 
-  builder_publish_cleanup
+  ci_publish_cleanup
 
   #
   # Verify that the Delphi environment is correct for a release build
@@ -164,7 +164,7 @@ function do_publish() {
 
   builder_echo info "Cleaning up package.json after 'npm version'"
   # And then cleanup the mess
-  builder_publish_cleanup
+  ci_publish_cleanup
   # Restore all the package.json files and package-lock.json files that
   # were clobbered by 'npm version'
   pushd "$KEYMAN_ROOT" >/dev/null
diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index 7c0f8f0ed9..0f5aacbac5 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman Developer web utility module" \
   "@/common/web/types" \
@@ -52,4 +52,4 @@ builder_run_action clean       rm -rf ./build/
 builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       do_build
 builder_run_action test        typescript_run_eslint_mocha_tests 45
-builder_run_action publish     builder_publish_npm
+builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc-analyze/build.sh b/developer/src/kmc-analyze/build.sh
index d54ed8927f..5dc53b4312 100755
--- a/developer/src/kmc-analyze/build.sh
+++ b/developer/src/kmc-analyze/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman Developer Compiler Analysis Tools" \
   "@/common/web/types" \
@@ -32,4 +32,4 @@ builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       typescript_run_eslint_mocha_tests 70
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc-copy/build.sh b/developer/src/kmc-copy/build.sh
index eb52215ec9..45e9029f09 100755
--- a/developer/src/kmc-copy/build.sh
+++ b/developer/src/kmc-copy/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman kmc-copy module" \
   "@/common/web/keyman-version" \
@@ -43,4 +43,4 @@ builder_run_action api        api-extractor run --local --verbose
 # TODO: -skip-full
 builder_run_action test       typescript_run_eslint_mocha_tests 75
 
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc-generate/build.sh b/developer/src/kmc-generate/build.sh
index f1762f4ccf..c02a7ed26a 100755
--- a/developer/src/kmc-generate/build.sh
+++ b/developer/src/kmc-generate/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman kmc-generate module" \
   "@/common/web/keyman-version" \
@@ -44,4 +44,4 @@ builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       typescript_run_eslint_mocha_tests
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc-keyboard-info/build.sh b/developer/src/kmc-keyboard-info/build.sh
index b22d973636..36a840212f 100755
--- a/developer/src/kmc-keyboard-info/build.sh
+++ b/developer/src/kmc-keyboard-info/build.sh
@@ -40,6 +40,6 @@ builder_run_action test        typescript_run_eslint_mocha_tests
 
 #-------------------------------------------------------------------------------------------------------------------
 
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
-builder_run_action publish      builder_publish_npm
+builder_run_action publish      ci_publish_npm
diff --git a/developer/src/kmc-kmn/build.sh b/developer/src/kmc-kmn/build.sh
index 867f791bf9..7d94f880df 100755
--- a/developer/src/kmc-kmn/build.sh
+++ b/developer/src/kmc-kmn/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman Developer Compiler Module for .kmn to .kmx" \
   "@/common/web/keyman-version" \
@@ -74,4 +74,4 @@ builder_run_action test       do_test
 
 #-------------------------------------------------------------------------------------------------------------------
 
-builder_run_action publish  builder_publish_npm
+builder_run_action publish  ci_publish_npm
diff --git a/developer/src/kmc-ldml/build.sh b/developer/src/kmc-ldml/build.sh
index 73763be4d5..2f3eb01bc2 100755
--- a/developer/src/kmc-ldml/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -93,6 +93,6 @@ builder_run_action test            typescript_run_eslint_mocha_tests  90
 
 #-------------------------------------------------------------------------------------------------------------------
 
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
-builder_run_action publish     builder_publish_npm
+builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh
index 816a195e00..00983ae6ea 100755
--- a/developer/src/kmc-model-info/build.sh
+++ b/developer/src/kmc-model-info/build.sh
@@ -37,6 +37,6 @@ builder_run_action test         typescript_run_eslint_mocha_tests 55
 
 #-------------------------------------------------------------------------------------------------------------------
 
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
-builder_run_action publish     builder_publish_npm
+builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh
index f2eef55cfc..bd758b18f9 100755
--- a/developer/src/kmc-model/build.sh
+++ b/developer/src/kmc-model/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Keyman kmc Lexical Model Compiler module" \
   "@/common/web/keyman-version" \
@@ -42,5 +42,5 @@ builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
 builder_run_action api          api-extractor run --local --verbose
 builder_run_action test         typescript_run_eslint_mocha_tests
-builder_run_action publish      builder_publish_npm
+builder_run_action publish      ci_publish_npm
 
diff --git a/developer/src/kmc-package/build.sh b/developer/src/kmc-package/build.sh
index 4b9379881a..66f430ceb4 100755
--- a/developer/src/kmc-package/build.sh
+++ b/developer/src/kmc-package/build.sh
@@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 
 builder_describe "Build Keyman kmc Package Compiler module" \
   "@/common/web/keyman-version" \
@@ -39,4 +39,4 @@ builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
 builder_run_action test       typescript_run_eslint_mocha_tests
-builder_run_action publish     builder_publish_npm
+builder_run_action publish     ci_publish_npm
diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index 1644540651..e784a441cc 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
@@ -114,4 +114,4 @@ builder_run_action build      do_build
 builder_run_action test       do_test
 builder_run_action api        do_api
 builder_run_action bundle     do_bundle
-builder_run_action publish    builder_publish_npm
+builder_run_action publish    ci_publish_npm
diff --git a/developer/src/kmc/test/command-line-tests.sh b/developer/src/kmc/test/command-line-tests.sh
index 41652bcdfd..9d4a1281c5 100755
--- a/developer/src/kmc/test/command-line-tests.sh
+++ b/developer/src/kmc/test/command-line-tests.sh
@@ -8,10 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-# . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
-
 builder_describe "Test Keyman Keyboard Compiler kmc command line e2e" \
   "test" \
   "--verbose,-v          Verbose logging of output from kmc" \
diff --git a/developer/src/kmcmplib/build.sh b/developer/src/kmcmplib/build.sh
index 952c0732b8..71fa331f41 100755
--- a/developer/src/kmcmplib/build.sh
+++ b/developer/src/kmcmplib/build.sh
@@ -7,7 +7,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$THIS_SCRIPT_PATH/checkout-keyboards.inc.sh"
 . "$THIS_SCRIPT_PATH/commands.inc.sh"
 
diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh
index f571c8209b..3334b4746e 100755
--- a/oem/firstvoices/android/build.sh
+++ b/oem/firstvoices/android/build.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
 # ################################ Main script ################################
diff --git a/resources/build/build-utils-ci.test.sh b/resources/build/build-utils-ci.test.sh
deleted file mode 100755
index a4d79e5d5a..0000000000
--- a/resources/build/build-utils-ci.test.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script tests build-utils-ci.sh
-#
-
-set -eu
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
-# END STANDARD BUILD SCRIPT INCLUDE
-
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-
-# Tests
-
-builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER not set${COLOR_RESET}"
-if ! builder_pull_get_details; then
-  builder_echo green "  ✓ PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
-else
-  builder_die "FAIL: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
-fi
-
-
-builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=master${COLOR_RESET}"
-TEAMCITY_PR_NUMBER=master
-if ! builder_pull_get_details; then
-  builder_echo green "  ✓ PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
-else
-  builder_die "FAIL: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
-fi
-
-
-builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=$TEAMCITY_PR_NUMBER${COLOR_RESET}"
-TEAMCITY_PR_NUMBER=7248
-if ! builder_pull_get_details; then
-  builder_die "FAIL: builder_pull_get_details was unable to read and parse PR details for #$TEAMCITY_PR_NUMBER from GitHub"
-fi
-
-# print metadata from PR
-builder_echo "  pull number: $builder_pull_number"
-builder_echo "  title:       $builder_pull_title"
-builder_echo "  labels:      ${builder_pull_labels[*]}"
-
-builder_echo green "  ✓ PASS: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=$TEAMCITY_PR_NUMBER"
-
-
-builder_echo "${COLOR_BLUE}## Testing: builder_pull_has_label epic-ldml${COLOR_RESET}"
-if ! builder_pull_has_label epic-ldml; then
-  builder_die "FAIL: builder_pull_has_label epic-ldml"
-fi
-
-builder_echo green "  ✓ PASS: builder_pull_has_label epic-ldml"
-
-builder_echo "All tests passed."
diff --git a/resources/build/build-utils-ci.inc.sh b/resources/build/ci/ci-publish.inc.sh
similarity index 73%
rename from resources/build/build-utils-ci.inc.sh
rename to resources/build/ci/ci-publish.inc.sh
index 33c074037a..d8fc1e77a2 100644
--- a/resources/build/build-utils-ci.inc.sh
+++ b/resources/build/ci/ci-publish.inc.sh
@@ -8,60 +8,6 @@
 
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
-#
-# Returns 0 if current build is in CI and triggered from a pull request. If it
-# returns 0, then a call is made to GitHub to get pull request details, and the
-# PR details are added to $builder_pull_title, $builder_pull_number, and
-# the $builder_pull_labels array.
-#
-# Note that the GitHub REST call is made with credentials if $GITHUB_TOKEN is
-# available; without credentials it will be subject to IP-based rate limits.
-#
-builder_pull_get_details() {
-  builder_pull_title=
-  builder_pull_number=
-  builder_pull_labels=()
-  if [[ ! ${TEAMCITY_PR_NUMBER-} =~ ^[0-9]+$ ]]; then
-    return 1
-  fi
-
-  if [ -z "${GITHUB_TOKEN-}" ]; then
-    local pull_data=`curl -s https://api.github.com/repos/keymanapp/keyman/pulls/$TEAMCITY_PR_NUMBER`
-  else
-    local pull_data=`curl -H "Authorization: Bearer $GITHUB_TOKEN" -s https://api.github.com/repos/keymanapp/keyman/pulls/$TEAMCITY_PR_NUMBER`
-  fi
-
-  builder_pull_title=`echo $pull_data | $JQ .title`
-
-  # Simple poor bash test if data returned from API is valid
-  if [[ -z builder_pull_title ]]; then
-    return 1
-  fi
-
-  builder_pull_number=$TEAMCITY_PR_NUMBER
-  builder_pull_labels=(`echo $pull_data | $JQ -jr '.labels[].name|.," "'`)
-
-  return 0
-}
-
-
-#
-# Returns 0 if the current PR has a particular label. Requires
-# builder_pull_get_details to have successfully run first
-#
-# Usage:
-#   builder_pull_has_label "label-name"
-# Parameters
-#   1: $label       label to test
-#
-function builder_pull_has_label() {
-  local label="$1"
-  if [[ " ${builder_pull_labels[*]} " =~ " $label " ]]; then
-    return 0
-  fi
-  return 1
-}
-
 #
 # Publishes the package in `cwd` to npm
 #
@@ -73,27 +19,27 @@ function builder_pull_has_label() {
 # modified. This change should not be committed to the repository.
 #
 # If --npm-publish is set:
-#  * then builder_publish_npm publishes to the public registry
-#  * else builder_publish_npm creates a local tarball which can be used to test
+#  * then ci_publish_npm publishes to the public registry
+#  * else ci_publish_npm creates a local tarball which can be used to test
 #
 # Usage:
 # ```bash
-#   builder_publish_npm
+#   ci_publish_npm
 # ```
 #
-function builder_publish_npm() {
+function ci_publish_npm() {
   if builder_has_option --npm-publish; then
     # Require --dry-run if local or test to avoid accidentally clobbering npm packages
     if [[ $KEYMAN_VERSION_ENVIRONMENT =~ local|test ]] && ! builder_has_option --dry-run; then
       builder_die "publish --npm-publish must use --dry-run flag for local or test builds"
     fi
-    _builder_publish_npm_package publish
+    _ci_publish_npm_package publish
   else
-    _builder_publish_npm_package pack
+    _ci_publish_npm_package pack
   fi
 }
 
-function _builder_publish_npm_package() {
+function _ci_publish_npm_package() {
   local action=$1
   local dist_tag=$KEYMAN_TIER dry_run=
 
@@ -105,9 +51,9 @@ function _builder_publish_npm_package() {
     dry_run=--dry-run
   fi
 
-  _builder_publish_cache_package_json
-  _builder_write_npm_version
-  _builder_prepublish
+  _ci_publish_cache_package_json
+  _ci_write_npm_version
+  _ci_prepublish
 
   # Note: In either case, npm publish MUST be given --access public to publish a
   # package in the @keymanapp scope on the public npm package index.
@@ -124,7 +70,7 @@ function _builder_publish_npm_package() {
   fi
 }
 
-function _builder_write_npm_version() {
+function _ci_write_npm_version() {
   # We use --no-git-tag-version because our CI system controls version numbering
   # and already tags releases. We also want to have the version of this match
   # the release of Keyman Developer -- these two versions should be in sync.
@@ -160,7 +106,7 @@ function _builder_write_npm_version() {
 # the target's package.json in its node_modules folder. Must run from
 # the target's folder.
 #
-function _builder_prepublish() {
+function _ci_prepublish() {
   mkdir -p node_modules/@keymanapp
   local packages=($(cat package.json | "$JQ" --raw-output '.bundleDependencies | join(" ")'))
   local package
@@ -198,7 +144,7 @@ function _builder_prepublish() {
 # dependencies easily. Part of the https://github.com/npm/cli/issues/3466
 # workaround.
 #
-function _builder_publish_cache_package_json() {
+function _ci_publish_cache_package_json() {
   if [[ -f "$KEYMAN_ROOT/builder_package_publish.json" ]]; then
     return 0
   fi
@@ -210,6 +156,6 @@ function _builder_publish_cache_package_json() {
   cp  "$KEYMAN_ROOT/package.json" "$KEYMAN_ROOT/builder_package_publish.json"
 }
 
-function builder_publish_cleanup() {
+function ci_publish_cleanup() {
   rm -f "$KEYMAN_ROOT/builder_package_publish.json"
 }
diff --git a/resources/build/github.inc.sh b/resources/build/ci/github.inc.sh
similarity index 96%
rename from resources/build/github.inc.sh
rename to resources/build/ci/github.inc.sh
index ff7779d242..af51c7a313 100644
--- a/resources/build/github.inc.sh
+++ b/resources/build/ci/github.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 ##
 ## Writes a status check message to GitHub against the reported SHA
diff --git a/resources/build/help-keyman-com.sh b/resources/build/ci/help-keyman-com.sh
similarity index 96%
rename from resources/build/help-keyman-com.sh
rename to resources/build/ci/help-keyman-com.sh
index 8d851b0afe..5f2d1420dc 100755
--- a/resources/build/help-keyman-com.sh
+++ b/resources/build/ci/help-keyman-com.sh
@@ -3,11 +3,15 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/ci/pull-requests.inc.sh"
 
+# TODO: convert to builder-full-compliant script
+
+cd "${THIS_SCRIPT_PATH}"
+
 #
 # Allows us to check for existence of subfolders in help/
 #
diff --git a/resources/build/sentry-control.inc.sh b/resources/build/ci/sentry-control.inc.sh
similarity index 94%
rename from resources/build/sentry-control.inc.sh
rename to resources/build/ci/sentry-control.inc.sh
index b01695af19..9331152eed 100644
--- a/resources/build/sentry-control.inc.sh
+++ b/resources/build/ci/sentry-control.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 #
 # This script centralises sentry symbol uploads and releases
diff --git a/resources/build/trigger-build-bot.inc.sh b/resources/build/ci/trigger-build-bot.inc.sh
similarity index 98%
rename from resources/build/trigger-build-bot.inc.sh
rename to resources/build/ci/trigger-build-bot.inc.sh
index 67b99b82b0..49dc8b2a4a 100644
--- a/resources/build/trigger-build-bot.inc.sh
+++ b/resources/build/ci/trigger-build-bot.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # set -eu
 
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/ci/trigger-builds.inc.sh
similarity index 98%
rename from resources/build/trigger-builds.inc.sh
rename to resources/build/ci/trigger-builds.inc.sh
index bfea20bb1a..0d54971b15 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/ci/trigger-builds.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 #
 # Tell TeamCity to trigger new release builds
diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/ci/trigger-definitions.inc.sh
similarity index 98%
rename from resources/build/trigger-definitions.inc.sh
rename to resources/build/ci/trigger-definitions.inc.sh
index 8748e63edf..74380e7311 100644
--- a/resources/build/trigger-definitions.inc.sh
+++ b/resources/build/ci/trigger-definitions.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # This file maps specific paths to build triggers
 #
diff --git a/resources/build/increment-version.sh b/resources/build/increment-version.sh
index 7116c6b917..9ad7c2beb2 100755
--- a/resources/build/increment-version.sh
+++ b/resources/build/increment-version.sh
@@ -22,9 +22,9 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
-. "${THIS_SCRIPT%/*}/trigger-builds.inc.sh"
-. "${THIS_SCRIPT%/*}/sentry-control.inc.sh"
+. "${THIS_SCRIPT%/*}/ci/trigger-definitions.inc.sh"
+. "${THIS_SCRIPT%/*}/ci/trigger-builds.inc.sh"
+. "${THIS_SCRIPT%/*}/ci/sentry-control.inc.sh"
 
 gitbranch=`git branch --show-current`
 
diff --git a/resources/build/run-required-test-builds.sh b/resources/build/run-required-test-builds.sh
index 0ccffd69a2..64ff30a1fd 100755
--- a/resources/build/run-required-test-builds.sh
+++ b/resources/build/run-required-test-builds.sh
@@ -12,9 +12,9 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
-. "${THIS_SCRIPT%/*}/trigger-builds.inc.sh"
-. "${THIS_SCRIPT%/*}/trigger-build-bot.inc.sh"
+. "${THIS_SCRIPT%/*}/ci/trigger-definitions.inc.sh"
+. "${THIS_SCRIPT%/*}/ci/trigger-builds.inc.sh"
+. "${THIS_SCRIPT%/*}/ci/trigger-build-bot.inc.sh"
 . "${THIS_SCRIPT%/*}/jq.inc.sh"
 
 builder_describe "Run test builds for the given pull request/primary branch" \
diff --git a/resources/build/test/build-bot/trigger-build-bot.test.sh b/resources/build/test/build-bot/trigger-build-bot.test.sh
index de2f3d5214..4098f4b5ae 100755
--- a/resources/build/test/build-bot/trigger-build-bot.test.sh
+++ b/resources/build/test/build-bot/trigger-build-bot.test.sh
@@ -6,8 +6,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "${THIS_SCRIPT_PATH}/../../trigger-definitions.inc.sh"
-. "${THIS_SCRIPT_PATH}/../../trigger-build-bot.inc.sh"
+. "${THIS_SCRIPT_PATH}/../../ci/trigger-definitions.inc.sh"
+. "${THIS_SCRIPT_PATH}/../../ci/trigger-build-bot.inc.sh"
 . "${THIS_SCRIPT_PATH}/../test-utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/jq.inc.sh"
 
diff --git a/resources/teamcity/includes/tc-helpers.inc.sh b/resources/teamcity/includes/tc-helpers.inc.sh
index 17776033fe..b4c62826e1 100644
--- a/resources/teamcity/includes/tc-helpers.inc.sh
+++ b/resources/teamcity/includes/tc-helpers.inc.sh
@@ -27,13 +27,7 @@ tc_upload_help() {
   local PRODUCT=$1
   local PRODUCT_PATH=$2
   builder_echo start "upload help" "Uploading new ${PRODUCT} help to help.keyman.com"
-
-  (
-    # shellcheck disable=SC2164,SC2154
-    cd "${KEYMAN_ROOT}/resources/build"
-    "${KEYMAN_ROOT}/resources/build/help-keyman-com.sh" "${PRODUCT_PATH}"
-  )
-
+  "${KEYMAN_ROOT}/resources/build/ci/help-keyman-com.sh" "${PRODUCT_PATH}"
   builder_echo end "upload help" success "Finished uploading new ${PRODUCT} help to help.keyman.com"
 }
 
diff --git a/resources/teamcity/linux/keyman-linux-release.sh b/resources/teamcity/linux/keyman-linux-release.sh
index 78369686f9..87d2a51c03 100755
--- a/resources/teamcity/linux/keyman-linux-release.sh
+++ b/resources/teamcity/linux/keyman-linux-release.sh
@@ -120,8 +120,7 @@ function _publish_linux_help() {
     cd "${KEYMAN_ROOT}/../help.keyman.com" || exit 1
     # shellcheck disable=SC2016
     git config credential.helper '!f() { sleep 1; echo "username=${GITHUB_USER}"; echo "password=${GITHUB_TOKEN}"; }; f'
-    cd "${KEYMAN_ROOT}/resources/build"
-    ./help-keyman-com.sh linux
+    "${KEYMAN_ROOT}/resources/build/ci/help-keyman-com.sh" linux
   )
 
   builder_echo end "upload linux help" success "Upload new Keyman Linux help to help.keyman.com"
diff --git a/web/build.sh b/web/build.sh
index 4cb01f840e..4dc5189353 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -9,7 +9,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # ################################ Main script ################################
 
diff --git a/web/common.inc.sh b/web/common.inc.sh
index 4b24730d5d..fed2af8c7b 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 #
 
-# Needed for builder_is_ci_build check.
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
 # Compiles all build products corresponding to the specified target.
diff --git a/web/src/engine/predictive-text/templates/build.sh b/web/src/engine/predictive-text/templates/build.sh
index 7a3b98148c..01820ed765 100755
--- a/web/src/engine/predictive-text/templates/build.sh
+++ b/web/src/engine/predictive-text/templates/build.sh
@@ -10,7 +10,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
diff --git a/web/src/engine/predictive-text/wordbreakers/build.sh b/web/src/engine/predictive-text/wordbreakers/build.sh
index dcedb94e79..21617a89ed 100755
--- a/web/src/engine/predictive-text/wordbreakers/build.sh
+++ b/web/src/engine/predictive-text/wordbreakers/build.sh
@@ -10,7 +10,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
diff --git a/web/src/engine/predictive-text/worker-main/build.sh b/web/src/engine/predictive-text/worker-main/build.sh
index d6ddebc697..0fc63bfb32 100755
--- a/web/src/engine/predictive-text/worker-main/build.sh
+++ b/web/src/engine/predictive-text/worker-main/build.sh
@@ -13,7 +13,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
index 292f5d2442..4bf6fe8030 100755
--- a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
@@ -3,16 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-basic.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 # Defaults
diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh
index 5bb1a51f85..25276eaa6e 100755
--- a/web/src/engine/predictive-text/worker-thread/build.sh
+++ b/web/src/engine/predictive-text/worker-thread/build.sh
@@ -11,7 +11,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/node.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/web/common.inc.sh"
 
 WORKER_OUTPUT=build/obj
diff --git a/web/src/tools/building/check-build-size.sh b/web/src/tools/building/check-build-size.sh
index ce19e0b226..f4741cbce6 100755
--- a/web/src/tools/building/check-build-size.sh
+++ b/web/src/tools/building/check-build-size.sh
@@ -16,7 +16,7 @@ SIZE_THRESHOLD=1024
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
-. "$KEYMAN_ROOT/resources/build/github.inc.sh"
+. "$KEYMAN_ROOT/resources/build/ci/github.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 display_usage() {
diff --git a/web/test.sh b/web/test.sh
index 9c877e8d6e..b65af498df 100755
--- a/web/test.sh
+++ b/web/test.sh
@@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # This script runs from its own folder
diff --git a/windows/src/desktop/build.sh b/windows/src/desktop/build.sh
index bcfd7cdc20..f5401e22b5 100755
--- a/windows/src/desktop/build.sh
+++ b/windows/src/desktop/build.sh
@@ -6,7 +6,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe \