diff --git a/.github/workflows/detect-breaking-changes-build.yml b/.github/workflows/detect-breaking-changes-build.yml
index dd4049e869e..43b03ff22e2 100644
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -34,8 +34,11 @@ jobs:
     - name: Build packages
       run: yarn packages:build
 
-    - name: Zip built packages
-      run: zip -r ./pr_built_packages.zip ./packages/**/dist
+    - name: Pack packages
+      run: yarn packages:pack --out ./%s.tgz 
+
+    - name: Zip built tarballed packages
+      run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
 
     - name: Upload build output as artifact
       uses: actions/upload-artifact@v3
@@ -75,8 +78,11 @@ jobs:
     - name: Build packages
       run: yarn packages:build
 
-    - name: Zip built packages
-      run: zip -r ./base_built_packages.zip ./packages/**/dist
+    - name: Pack packages
+      run: yarn packages:pack --out ./%s.tgz
+
+    - name: Zip built tarballed packages
+      run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
 
     - name: Upload build output as artifact
       uses: actions/upload-artifact@v3
@@ -105,10 +111,10 @@ jobs:
           name: buildBase
       
       - name: Unzip artifact from pr
-        run: unzip pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
+        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
 
       - name: Unzip artifact from base
-        run: unzip base_built_packages.zip -d ./base && rm base_built_packages.zip
+        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
 
       - name: Get link for the Github Action job
         id: job
diff --git a/scripts/check-breaking-changes.sh b/scripts/check-breaking-changes.sh
index 94834b59f07..a8413490974 100755
--- a/scripts/check-breaking-changes.sh
+++ b/scripts/check-breaking-changes.sh
@@ -12,14 +12,20 @@ while IFS=" " read -r -a package; do
     PACKAGE_PATH=$(basename "$package")
 
     # Calculate current and previous package paths / names
-    PREV="./base/packages/$PACKAGE_PATH/dist/"
-    CURRENT="./pr/packages/$PACKAGE_PATH/dist/"
+    PREV="./base/$PACKAGE_PATH"
+    CURRENT="./pr/$PACKAGE_PATH"
 
     # Temporarily skipping these packages as they don't have any exposed static typing
     if [[ "$PACKAGE_PATH" == 'grafana-toolkit' || "$PACKAGE_PATH" == 'jaeger-ui-components' ]]; then
         continue
     fi
 
+    # Extract the npm package tarballs into separate directories e.g. ./base/@grafana-data.tgz -> ./base/grafana-data/
+    mkdir $PREV
+    tar -xf ./base/@$PACKAGE_PATH.tgz --strip-components=1 -C $PREV
+    mkdir $CURRENT
+    tar -xf ./pr/@$PACKAGE_PATH.tgz --strip-components=1 -C $CURRENT
+
     # Run the comparison and record the exit code
     echo ""
     echo ""