diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 1c1bf8bb..9b2a5dee 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -42,16 +42,7 @@ jobs:
         run: npm ci
         env:
           CI: true
-      - name: Pack CORE package
-        run: npm pack ./packages/core
-      - name: Use local CORE package in CLI
-        run: |
-          version=$(cat ./packages/core/package.json | jq '.version' | tr -d '"')
-          jq '.dependencies."@redocly/openapi-core" = $packagefile' ./packages/cli/package.json --arg packagefile file:./redocly-openapi-core-$version.tgz > package.json.tmp && mv package.json.tmp ./packages/cli/package.json
-      - name: Output package.json
-        run: cat ./packages/cli/package.json
-
-      - name: Prepare CLI package
+      - name: Prepare CLI and Core packages
         run: npm run pack:prepare
       - name: Install CLI Package
         run: npm install -g redocly-cli.tgz
diff --git a/package.json b/package.json
index d533db62..f4d886bb 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "webpack-bundle": "webpack --config webpack.config.ts",
     "upload": "node scripts/archive-and-upload-bundle.js",
     "deploy-local": "npm run webpack-bundle && npm run compile && ENV=local npm run upload",
-    "pack:prepare": "cd packages/cli && (mv \"$(npm pack | tail -n 1)\" ../../redocly-cli.tgz)"
+    "pack:prepare": "bash scripts/local-pack.sh"
   },
   "workspaces": [
     "packages/*"
diff --git a/scripts/local-pack.sh b/scripts/local-pack.sh
new file mode 100755
index 00000000..e198da94
--- /dev/null
+++ b/scripts/local-pack.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd packages/core && core=$(npm pack | tail -n 1) && mv $core ../../openapi-core.tgz && cd ../../ &&
+
+version=$(cat ./packages/core/package.json | jq '.version' | tr -d '"')
+jq '.dependencies."@redocly/openapi-core" = $packagefile' ./packages/cli/package.json --arg packagefile file:./openapi-core.tgz > package.json.tmp && mv package.json.tmp ./packages/cli/package.json &&
+
+cd packages/cli && cli=$(npm pack | tail -n 1) && mv $cli ../../redocly-cli.tgz
+