diff --git a/.github/workflows/deploy-next.yml b/.github/workflows/deploy-next.yml
index e4186cf21e5..fd5c6b789a5 100644
--- a/.github/workflows/deploy-next.yml
+++ b/.github/workflows/deploy-next.yml
@@ -21,11 +21,6 @@ jobs:
           registry-url: "https://registry.npmjs.org"
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: e2e test
-        run: |
-          npm install
-          npm run build
-          npm test
       - name: storybook/next deployment
         env:
           NEXT_RELEASE_ENABLED: ${{ secrets.NEXT_RELEASE_ENABLED }}
@@ -36,14 +31,22 @@ jobs:
             if npm run util:is-next-deployable; then
               git config --global user.email "github-actions[bot]@users.noreply.github.com"
               git config --global user.name "github-actions[bot]"
+
+              npm install
+              # version the packages with lerna before building to ensure 
+              # the version in the CC source code preamble is correct for deployment
+              npm run version:next
+              npm run build
+              npm test
+
               # deploy storybook, but still release next if it fails
               { npm run --workspace=@esri/calcite-components build-storybook &&
                 npx --workspace=@esri/calcite-components storybook-to-ghpages \
-                   --host-token-env-variable=GH_TOKEN_FOR_STORYBOOK --existing-output-dir=docs --ci; } || true
+                    --host-token-env-variable=GH_TOKEN_FOR_STORYBOOK \
+                    --existing-output-dir=docs --ci; } || true
 
-              # remove the build to docs after storybook deploys to gh-pages
+              # remove the built docs after storybook deploys to gh-pages
               git reset --hard
-              npm run version:next
               npm run publish:next
               npm run util:push-tags
             fi
diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json
index ce43f1b64af..06b31402036 100644
--- a/packages/calcite-components/package.json
+++ b/packages/calcite-components/package.json
@@ -34,7 +34,6 @@
     "lint:scss": "stylelint --fix \"src/**/*.scss\" && prettier --write \"**/*.scss\" >/dev/null",
     "lint:ts": "eslint --ext .ts,.tsx --fix . && prettier --write \"**/*.ts?(x)\" >/dev/null",
     "posttest": "npm run test:prerender",
-    "prepublishOnly": "./support/buildForPreambleVersion.sh",
     "release:docs": "npm run docs && storybook-to-ghpages --existing-output-dir=docs",
     "start": "npm run util:clean-js-files && concurrently --kill-others --raw \"tsc --project ./tsconfig-demos.json --watch\" \"npm run build:watch-dev -- --serve\"",
     "test": "stencil test --no-docs --no-build --spec --e2e",
@@ -51,7 +50,7 @@
     "util:patch-esm-resolution": "ts-node --esm support/patchESMResolution.ts",
     "util:prep-build-reqs": "npm run util:copy-assets && npm run util:generate-t9n-types",
     "util:sync-t9n-en-bundles": "ts-node --esm support/syncEnT9nBundles.ts",
-    "util:test-types": "tsc --esModuleInterop dist/types/**/*.d.ts dist/components/*.d.ts && ! grep -rnw 'dist/types' -e '<reference types=' && npm run util:clean-js-files",
+    "util:test-types": "! grep -rnw 'dist/types' -e '<reference types='",
     "util:clean-js-files": "rimraf --glob -- *.js {src,.storybook,support}/**.js",
     "util:clean-readmes": "git restore src/components/*/readme.md",
     "util:is-working-tree-clean": "[ -z \"$(git status --porcelain=v1)\" ]"
diff --git a/packages/calcite-components/support/buildForPreambleVersion.sh b/packages/calcite-components/support/buildForPreambleVersion.sh
deleted file mode 100755
index 0687633955c..00000000000
--- a/packages/calcite-components/support/buildForPreambleVersion.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env sh
-
-# This runs in the prepublishOnly NPM script hook after versioning
-# so that the preamble in the dist source code is correct.
-#
-# Refs:
-# https://github.com/lerna/lerna/blob/main/libs/commands/publish/README.md#lifecycle-scripts
-# https://docs.npmjs.com/cli/v8/using-npm/scripts#life-cycle-scripts
-# https://github.com/Esri/calcite-design-system/pull/4303
-
-# The vscode data is not being generated if the file already exists
-rimraf dist/extras/vscode-data.json
-npm run build
-npm run util:test-types