diff --git a/aio/package.json b/aio/package.json
index d22edd6a7b..6c4eb5ff54 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -17,11 +17,11 @@
     "build": "yarn ~~build",
     "prebuild-local": "yarn setup-local",
     "build-local": "yarn ~~build",
-    "prebuild-local-ci": "yarn setup-local --no-build-packages",
+    "prebuild-local-ci": "yarn setup-local-ci",
     "build-local-ci": "yarn ~~build --progress=false",
     "prebuild-local-with-viewengine": "node scripts/switch-to-viewengine && yarn setup-local",
     "build-local-with-viewengine": "yarn ~~build",
-    "prebuild-local-with-viewengine-ci": "node scripts/switch-to-viewengine && yarn setup-local --no-build-packages",
+    "prebuild-local-with-viewengine-ci": "node scripts/switch-to-viewengine && yarn setup-local-ci",
     "build-local-with-viewengine-ci": "yarn ~~build --progress=false",
     "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 38635d2d9",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
@@ -32,8 +32,11 @@
     "setup": "yarn example-use-npm && yarn aio-use-npm",
     "postsetup": "yarn boilerplate:add && yarn extract-cli-command-docs && yarn docs",
     "presetup-local": "yarn presetup",
-    "setup-local": "yarn example-use-local && yarn aio-use-local",
+    "setup-local": "yarn aio-use-local && yarn example-use-local",
     "postsetup-local": "yarn postsetup",
+    "presetup-local-ci": "yarn presetup-local",
+    "setup-local-ci": "yarn aio-use-local --no-build-packages && yarn example-use-local",
+    "postsetup-local-ci": "yarn postsetup-local",
     "set-opensearch-url": "node --eval \"const sh = require('shelljs'); sh.set('-e'); sh.sed('-i', /PLACEHOLDER_URL/g, process.argv[1], 'dist/assets/opensearch.xml');\"",
     "presmoke-tests": "yarn update-webdriver",
     "smoke-tests": "protractor tests/deployment/e2e/protractor.conf.js --suite smoke --baseUrl",