diff --git a/packages-exp/messaging-compat/package.json b/packages-exp/messaging-compat/package.json
index ade4c2b74bc..a1055818b0e 100644
--- a/packages-exp/messaging-compat/package.json
+++ b/packages-exp/messaging-compat/package.json
@@ -25,7 +25,7 @@
     "test:karma": "karma start --single-run",
     "test:debug": "karma start --browsers=Chrome --auto-watch",
     "type-check": "tsc --noEmit",
-    "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/messaging-exp-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging"
+    "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/index-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging"
   },
   "peerDependencies": {
     "@firebase/app-compat": "0.x"
diff --git a/packages-exp/messaging-exp/api-extractor.json b/packages-exp/messaging-exp/api-extractor.json
index cfd9ee5b3ea..d68a256c8c5 100644
--- a/packages-exp/messaging-exp/api-extractor.json
+++ b/packages-exp/messaging-exp/api-extractor.json
@@ -8,8 +8,15 @@
   }],
   "dtsRollup": {
     /** 
-     * rollup is not supported when multiple entry points are present
+     * rollup is not supported when multiple entry points are present.
+     * npm script api-report:rollup is used to generate dts rollup.
      */
     "enabled": false
-  }
+  },
+  "apiReport": {
+    /**
+     * apiReport is handled by npm script api-report:rollup
+     */
+    "enabled": false
+}
 }
diff --git a/packages-exp/messaging-exp/package.json b/packages-exp/messaging-exp/package.json
index 68fc0b1653b..15cf8cbceda 100644
--- a/packages-exp/messaging-exp/package.json
+++ b/packages-exp/messaging-exp/package.json
@@ -18,15 +18,18 @@
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "build": "rollup -c && yarn api-report",
     "build:deps": "lerna run --scope @firebase/'{app-exp,messaging-exp}' --include-dependencies build",
-    "build:release": "rollup -c rollup.config.release.js && yarn api-report",
+    "build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
     "dev": "rollup -c -w",
     "test": "run-p test:karma type-check lint ",
     "test:integration": "run-p test:karma type-check lint && cd ../../integration/messaging && npm run-script test",
     "test:ci": "node ../../scripts/run_tests_in_ci.js",
     "test:karma": "karma start --single-run",
     "test:debug": "karma start --browsers=Chrome --auto-watch",
-    "api-report": "api-extractor run --local --verbose",
-    "type-check": "tsc --noEmit"
+    "api-report": "yarn api-report:rollup && yarn api-report:api-json",
+    "api-report:rollup": "ts-node-script ../../repo-scripts/prune-dts/extract-public-api.ts --package messaging-exp --packageRoot . --typescriptDts ./dist/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/index-public.d.ts",
+    "api-report:api-json": "api-extractor run --local --verbose",
+    "type-check": "tsc --noEmit",
+    "typings:public": "node ../../scripts/exp/use_typings.js ./dist/index-public.d.ts"
   },
   "license": "Apache-2.0",
   "peerDependencies": {
@@ -54,4 +57,4 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "esm5": "dist/index.esm.js"
-}
\ No newline at end of file
+}