diff --git a/.buildkite/scripts/bootstrap.sh b/.buildkite/scripts/bootstrap.sh
index 6d5d793b73cec..ca5241c9d015b 100755
--- a/.buildkite/scripts/bootstrap.sh
+++ b/.buildkite/scripts/bootstrap.sh
@@ -29,10 +29,6 @@ if [[ "$(pwd)" != *"/local-ssd/"* && "$(pwd)" != "/dev/shm"* ]]; then
     mkdir -p ./.moon/cache
     echo "Extracting moon-cache.tar.gz to ./.moon/cache"
     tar -xzf ~/moon-cache.tar.gz -C ./
-  elif [[ -d ~/.kibana-moon-cache ]]; then
-    echo "Using ~/.moon/cache as a starting point"
-    mkdir -p ./.moon/cache
-    mv ~/.kibana-moon-cache/* ./.moon/cache
   fi
 fi
 
diff --git a/.buildkite/scripts/common/setup_job_env.sh b/.buildkite/scripts/common/setup_job_env.sh
index f3f7d98330b2d..e2be065c989b0 100644
--- a/.buildkite/scripts/common/setup_job_env.sh
+++ b/.buildkite/scripts/common/setup_job_env.sh
@@ -256,7 +256,6 @@ if [[ "${CI:-}" =~ ^(1|true)$ ]]; then
   MOON_REMOTE_CACHE_TOKEN=$(vault_get moon-remote-cache token)
   export MOON_REMOTE_CACHE_TOKEN
 fi
-export MOON_CACHE=off
 
 PIPELINE_PRE_COMMAND=${PIPELINE_PRE_COMMAND:-".buildkite/scripts/lifecycle/pipelines/$BUILDKITE_PIPELINE_SLUG/pre_command.sh"}
 if [[ -f "$PIPELINE_PRE_COMMAND" ]]; then
diff --git a/.buildkite/scripts/steps/store_cache.sh b/.buildkite/scripts/steps/store_cache.sh
index 92ab546ef54af..66a0d41b28c87 100755
--- a/.buildkite/scripts/steps/store_cache.sh
+++ b/.buildkite/scripts/steps/store_cache.sh
@@ -6,6 +6,7 @@ source .buildkite/scripts/common/util.sh
 
 export MOON_CACHE=write
 .buildkite/scripts/bootstrap.sh
+
 echo "--- Archive moon cache"
 if [[ ! -d .moon/cache ]]; then
   echo "No moon cache directory found, skipping archive"
diff --git a/.moon/workspace.yml b/.moon/workspace.yml
index 4e4dcb955f93b..938e2237c936c 100644
--- a/.moon/workspace.yml
+++ b/.moon/workspace.yml
@@ -16,14 +16,14 @@ pipeline:
 
 # https://moonrepo.dev/docs/guides/remote-cache
 # Auth credentials will be missing on local environments, but that's OK.
-# remote:
-#   host: "https://kibana-bazel-remote-h5qd3jkxkq-uc.a.run.app"
-#   api: http
-#   cache:
-#     localReadOnly: true
-#   auth:
-#     headers:
-#       Authorization: "Basic ${MOON_REMOTE_CACHE_TOKEN}"
+remote:
+  host: "https://kibana-bazel-remote-h5qd3jkxkq-uc.a.run.app"
+  api: http
+  cache:
+    localReadOnly: true
+  auth:
+    headers:
+      Authorization: "Basic ${MOON_REMOTE_CACHE_TOKEN}"
 
 
 telemetry: false
diff --git a/packages/kbn-plugin-helpers/src/tasks/build_webpack_packages.ts b/packages/kbn-plugin-helpers/src/tasks/build_webpack_packages.ts
index 71d45468e8256..9877797d5c826 100644
--- a/packages/kbn-plugin-helpers/src/tasks/build_webpack_packages.ts
+++ b/packages/kbn-plugin-helpers/src/tasks/build_webpack_packages.ts
@@ -22,7 +22,10 @@ export async function buildWebpackPackages({ log, quiet, dist }: TaskContext) {
 
   const args = ['kbn', 'build-shared'];
   if (quiet) args.push('--quiet');
-  if (dist) args.push('--dist');
+  if (dist) {
+    args.push('--dist');
+    args.push('--no-cache');
+  }
 
   await execa('yarn', args, { cwd: REPO_ROOT, stdio });
 }
diff --git a/src/dev/kbn_pm/src/commands/bootstrap/bootstrap_command.mjs b/src/dev/kbn_pm/src/commands/bootstrap/bootstrap_command.mjs
index 24d45eb676647..985aa8b456ff2 100644
--- a/src/dev/kbn_pm/src/commands/bootstrap/bootstrap_command.mjs
+++ b/src/dev/kbn_pm/src/commands/bootstrap/bootstrap_command.mjs
@@ -112,8 +112,8 @@ export const command = {
 
     await Promise.all([
       time('prepare webpack bundles for packages', async () => {
-        log.info('extract relevant versions for packages and pre-build webpack bundles');
-        await moonRun([':extract-version-dependencies', ':build-webpack'], {
+        log.info('pre-build webpack bundles');
+        await moonRun([':build-webpack'], {
           pipe: !quiet,
           quiet,
           noCache: forceInstall,
diff --git a/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.extend.yml b/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.extend.yml
index dcb5f07f18c70..17f4564981559 100644
--- a/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.extend.yml
+++ b/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.extend.yml
@@ -7,7 +7,7 @@ tasks:
   extract-version-dependencies:
     command: node
     args:
-      - $workspaceRoot/scripts/extract_version_dependencies.js
+      - scripts/extract_version_dependencies.js
       - src/platform/packages/private/kbn-ui-shared-deps-npm/version_dependencies.txt
       - --collect
       - '@babel/runtime'
@@ -110,7 +110,7 @@ tasks:
     args:
       - build
     deps:
-      - extract-version-dependencies
+      - ~:extract-version-dependencies
       - '^:build-webpack'
     inputs:
       - '@group(src)'
diff --git a/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.yml b/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.yml
index a19bc2da2ddd3..34f605a7aef2e 100644
--- a/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.yml
+++ b/src/platform/packages/private/kbn-ui-shared-deps-npm/moon.yml
@@ -36,7 +36,7 @@ tasks:
   extract-version-dependencies:
     command: node
     args:
-      - $workspaceRoot/scripts/extract_version_dependencies.js
+      - scripts/extract_version_dependencies.js
       - src/platform/packages/private/kbn-ui-shared-deps-npm/version_dependencies.txt
       - '--collect'
       - '@babel/runtime'
@@ -139,7 +139,7 @@ tasks:
     args:
       - build
     deps:
-      - extract-version-dependencies
+      - ~:extract-version-dependencies
       - ^:build-webpack
     inputs:
       - '@group(src)'
diff --git a/src/platform/packages/private/kbn-ui-shared-deps-src/moon.extend.yml b/src/platform/packages/private/kbn-ui-shared-deps-src/moon.extend.yml
index e4375dde8dba0..0fda3e3a18592 100644
--- a/src/platform/packages/private/kbn-ui-shared-deps-src/moon.extend.yml
+++ b/src/platform/packages/private/kbn-ui-shared-deps-src/moon.extend.yml
@@ -9,7 +9,7 @@ tasks:
   extract-version-dependencies:
     command: node
     args:
-      - $workspaceRoot/scripts/extract_version_dependencies.js
+      - scripts/extract_version_dependencies.js
       - src/platform/packages/private/kbn-ui-shared-deps-src/version_dependencies.txt
       - --collect
       - '@babel/plugin-transform-numeric-separator'
@@ -46,7 +46,7 @@ tasks:
     args:
       - build
     deps:
-      - extract-version-dependencies
+      - ~:extract-version-dependencies
       - '^:build-webpack'
     inputs:
       - '@group(src)'
diff --git a/src/platform/packages/private/kbn-ui-shared-deps-src/moon.yml b/src/platform/packages/private/kbn-ui-shared-deps-src/moon.yml
index fb61db2af2576..77e0d53106b2f 100644
--- a/src/platform/packages/private/kbn-ui-shared-deps-src/moon.yml
+++ b/src/platform/packages/private/kbn-ui-shared-deps-src/moon.yml
@@ -38,7 +38,7 @@ tasks:
   extract-version-dependencies:
     command: node
     args:
-      - $workspaceRoot/scripts/extract_version_dependencies.js
+      - scripts/extract_version_dependencies.js
       - src/platform/packages/private/kbn-ui-shared-deps-src/version_dependencies.txt
       - '--collect'
       - '@babel/plugin-transform-numeric-separator'
@@ -75,7 +75,7 @@ tasks:
     args:
       - build
     deps:
-      - extract-version-dependencies
+      - ~:extract-version-dependencies
       - ^:build-webpack
     inputs:
       - '@group(src)'
diff --git a/src/platform/packages/shared/kbn-monaco/moon.extend.yml b/src/platform/packages/shared/kbn-monaco/moon.extend.yml
index f772c4d1fb92a..687a544b1d890 100644
--- a/src/platform/packages/shared/kbn-monaco/moon.extend.yml
+++ b/src/platform/packages/shared/kbn-monaco/moon.extend.yml
@@ -7,7 +7,7 @@ tasks:
   extract-version-dependencies:
     command: node
     args:
-      - $workspaceRoot/scripts/extract_version_dependencies.js
+      - scripts/extract_version_dependencies.js
       - src/platform/packages/shared/kbn-monaco/version_dependencies.txt
       - --collect
       - babel-loader
@@ -34,7 +34,7 @@ tasks:
     args:
       - build
     deps:
-      - extract-version-dependencies
+      - ~:extract-version-dependencies
     inputs:
       - '@group(src)'
       - package.json
diff --git a/src/platform/packages/shared/kbn-monaco/moon.yml b/src/platform/packages/shared/kbn-monaco/moon.yml
index 6f5bfaf0ae402..c435d3c8db0dc 100644
--- a/src/platform/packages/shared/kbn-monaco/moon.yml
+++ b/src/platform/packages/shared/kbn-monaco/moon.yml
@@ -62,7 +62,7 @@ tasks:
   extract-version-dependencies:
     command: node
     args:
-      - $workspaceRoot/scripts/extract_version_dependencies.js
+      - scripts/extract_version_dependencies.js
       - src/platform/packages/shared/kbn-monaco/version_dependencies.txt
       - '--collect'
       - babel-loader
@@ -89,7 +89,7 @@ tasks:
     args:
       - build
     deps:
-      - extract-version-dependencies
+      - ~:extract-version-dependencies
     inputs:
       - '@group(src)'
       - package.json