diff --git a/packages/firestore/rollup.config.js b/packages/firestore/rollup.config.js
index 21b984ab929..9c06666f1fa 100644
--- a/packages/firestore/rollup.config.js
+++ b/packages/firestore/rollup.config.js
@@ -75,7 +75,7 @@ const allBuilds = [
   {
     input: './src/index.node.ts',
     output: {
-      file: pkg['main-esm'],
+      file: 'dist/index.node.intermediate.mjs',
       format: 'es',
       sourcemap: true
     },
@@ -88,7 +88,7 @@ const allBuilds = [
   },
   // Node CJS build
   {
-    input: pkg['main-esm'],
+    input: 'dist/index.node.intermediate.mjs',
     output: {
       file: pkg.main,
       format: 'cjs',
@@ -105,7 +105,7 @@ const allBuilds = [
   },
   // Node ESM build with build target reporting
   {
-    input: pkg['main-esm'],
+    input: 'dist/index.node.intermediate.mjs',
     output: {
       file: pkg['main-esm'],
       format: 'es',
@@ -123,7 +123,7 @@ const allBuilds = [
   {
     input: './src/index.ts',
     output: {
-      file: pkg.browser,
+      file: 'dist/index.esm2017.intermediate.js',
       format: 'es',
       sourcemap: true
     },
@@ -135,7 +135,7 @@ const allBuilds = [
   },
   // Convert es2017 build to ES5
   {
-    input: pkg['browser'],
+    input: 'dist/index.esm2017.intermediate.js',
     output: [
       {
         file: pkg['esm5'],
@@ -154,7 +154,7 @@ const allBuilds = [
   },
   // Convert es2017 build to cjs
   {
-    input: pkg['browser'],
+    input: 'dist/index.esm2017.intermediate.js',
     output: [
       {
         file: './dist/index.cjs.js',
@@ -170,7 +170,7 @@ const allBuilds = [
   },
   // es2017 build with build target reporting
   {
-    input: pkg['browser'],
+    input: 'dist/index.esm2017.intermediate.js',
     output: [
       {
         file: pkg['browser'],