diff --git a/scripts/exp/prepare-util.ts b/scripts/exp/prepare-util.ts
index 9a1fa132868..3579848e98d 100644
--- a/scripts/exp/prepare-util.ts
+++ b/scripts/exp/prepare-util.ts
@@ -65,7 +65,7 @@ export async function createCompatProject(config: CompatConfig) {
 
     compatPkgJson.dependencies = {
       ...srcPkgJson.dependencies,
-      [srcPkgJson.name]: '0.0.900'
+      [srcPkgJson.name]: srcPkgJson.version
     };
 
     compatPkgJson.peerDependencies = {
diff --git a/scripts/exp/release.ts b/scripts/exp/release.ts
index 67dcbb91d61..f65b5e504eb 100644
--- a/scripts/exp/release.ts
+++ b/scripts/exp/release.ts
@@ -157,10 +157,18 @@ async function publishExpPackages({ dryRun }: { dryRun: boolean }) {
       throw new Error('Version check failed');
     }
 
+    // publish all packages under packages-exp plus firestore, storage and database
+    const packagesToPublish = await mapWorkspaceToPackages([
+      `${projectRoot}/packages-exp/*`
+    ]);
+    packagePaths.push(`${projectRoot}/packages/firestore`);
+    packagePaths.push(`${projectRoot}/packages/storage`);
+    packagePaths.push(`${projectRoot}/packages/database`);
+
     /**
      * Release packages to NPM
      */
-    await publishToNpm(packagePaths, dryRun);
+    await publishToNpm(packagesToPublish, dryRun);
 
     /**
      * reset the working tree to recover package names with -exp in the package.json files,
diff --git a/yarn.lock b/yarn.lock
index 79a7b16fb84..25b917f4e9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1191,6 +1191,11 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+"@firebase/app-types@0.6.1":
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.1.tgz#dcbd23030a71c0c74fc95d4a3f75ba81653850e9"
+  integrity sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg==
+
 "@firebase/component@0.1.21":
   version "0.1.21"
   resolved "https://registry.npmjs.org/@firebase/component/-/component-0.1.21.tgz#56062eb0d449dc1e7bbef3c084a9b5fa48c7c14d"
@@ -7472,7 +7477,7 @@ firebase-admin@9.4.2:
     "@google-cloud/storage" "^5.3.0"
 
 "firebase-exp@file:packages-exp/firebase-exp":
-  version "0.900.20"
+  version "0.900.21"
   dependencies:
     "@firebase/analytics-compat" "0.0.900"
     "@firebase/analytics-exp" "0.0.900"
@@ -7480,8 +7485,8 @@ firebase-admin@9.4.2:
     "@firebase/app-exp" "0.0.900"
     "@firebase/auth-compat" "0.0.900"
     "@firebase/auth-exp" "0.0.900"
-    "@firebase/database" "0.9.7"
-    "@firebase/firestore" "2.2.2"
+    "@firebase/database" "0.9.8"
+    "@firebase/firestore" "2.2.3"
     "@firebase/functions-compat" "0.0.900"
     "@firebase/functions-exp" "0.0.900"
     "@firebase/messaging-compat" "0.0.900"
@@ -7490,7 +7495,7 @@ firebase-admin@9.4.2:
     "@firebase/performance-exp" "0.0.900"
     "@firebase/remote-config-compat" "0.0.900"
     "@firebase/remote-config-exp" "0.0.900"
-    "@firebase/storage" "0.4.6"
+    "@firebase/storage" "0.4.7"
 
 firebase-functions@3.13.0:
   version "3.13.0"
@@ -14050,13 +14055,6 @@ rollup@2.35.1:
   optionalDependencies:
     fsevents "~2.1.2"
 
-rollup@^2.35.1:
-  version "2.44.0"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.44.0.tgz#8da324d1c4fd12beef9ae6e12f4068265b6d95eb"
-  integrity sha512-rGSF4pLwvuaH/x4nAS+zP6UNn5YUDWf/TeEU5IoXSZKBbKRNTCI3qMnYXKZgrC0D2KzS2baiOZt1OlqhMu5rnQ==
-  optionalDependencies:
-    fsevents "~2.3.1"
-
 router@^1.3.1:
   version "1.3.5"
   resolved "https://registry.npmjs.org/router/-/router-1.3.5.tgz#cb2f47f74fd99a77fb3bc01cc947f46b79b1790f"