diff --git a/.changeset/eleven-swans-drive.md b/.changeset/eleven-swans-drive.md
new file mode 100644
index 00000000000..aebabc31bfc
--- /dev/null
+++ b/.changeset/eleven-swans-drive.md
@@ -0,0 +1,8 @@
+---
+'@firebase/analytics-compat': patch
+'@firebase/app-check-compat': patch
+'@firebase/app-compat': patch
+'@firebase/functions-compat': patch
+---
+
+Fix cjs builds by removing the named export from app-compat
diff --git a/.changeset/late-bobcats-swim.md b/.changeset/late-bobcats-swim.md
new file mode 100644
index 00000000000..25469a654de
--- /dev/null
+++ b/.changeset/late-bobcats-swim.md
@@ -0,0 +1,5 @@
+---
+'@firebase/firestore': patch
+---
+
+Make firestore/lite available in nodejs
diff --git a/packages/analytics-compat/src/service.test.ts b/packages/analytics-compat/src/service.test.ts
index 958f97c525c..30598025d61 100644
--- a/packages/analytics-compat/src/service.test.ts
+++ b/packages/analytics-compat/src/service.test.ts
@@ -16,7 +16,7 @@
  */
 import { expect, use } from 'chai';
 import { AnalyticsService } from './service';
-import { firebase, FirebaseApp } from '@firebase/app-compat';
+import firebase, { FirebaseApp } from '@firebase/app-compat';
 import * as analyticsExp from '@firebase/analytics';
 import { stub, match, SinonStub } from 'sinon';
 import * as sinonChai from 'sinon-chai';
diff --git a/packages/app-check-compat/src/service.test.ts b/packages/app-check-compat/src/service.test.ts
index 79c86043fdb..b10e45d3f11 100644
--- a/packages/app-check-compat/src/service.test.ts
+++ b/packages/app-check-compat/src/service.test.ts
@@ -16,7 +16,7 @@
  */
 import { expect, use } from 'chai';
 import { AppCheckService } from './service';
-import { firebase, FirebaseApp } from '@firebase/app-compat';
+import firebase, { FirebaseApp } from '@firebase/app-compat';
 import * as appCheckExp from '@firebase/app-check';
 import { stub, match, SinonStub } from 'sinon';
 import * as sinonChai from 'sinon-chai';
@@ -65,7 +65,7 @@ describe('Firebase App Check > Service', () => {
 
   it(
     'activate("string") calls modular initializeAppCheck() with a ' +
-      'ReCaptchaV3Provider',
+    'ReCaptchaV3Provider',
     () => {
       const initializeAppCheckStub = stub(appCheckExp, 'initializeAppCheck');
       service = new AppCheckService(app);
@@ -80,7 +80,7 @@ describe('Firebase App Check > Service', () => {
 
   it(
     'activate(CustomProvider) calls modular initializeAppCheck() with' +
-      ' a CustomProvider',
+    ' a CustomProvider',
     () => {
       const initializeAppCheckStub = stub(appCheckExp, 'initializeAppCheck');
       service = new AppCheckService(app);
@@ -167,7 +167,7 @@ describe('Firebase App Check > Service', () => {
 
   it('onTokenChanged() throws if activate() has not been called', async () => {
     service = createTestService(app);
-    expect(() => service.onTokenChanged(() => {})).to.throw(
+    expect(() => service.onTokenChanged(() => { })).to.throw(
       AppCheckError.USE_BEFORE_ACTIVATION
     );
   });
diff --git a/packages/app-compat/src/index.lite.ts b/packages/app-compat/src/index.lite.ts
index c411c425822..fa79dd77a54 100644
--- a/packages/app-compat/src/index.lite.ts
+++ b/packages/app-compat/src/index.lite.ts
@@ -18,7 +18,7 @@
 import { createFirebaseNamespaceLite } from './lite/firebaseNamespaceLite';
 import { registerCoreComponents } from './registerCoreComponents';
 
-export const firebase = createFirebaseNamespaceLite();
+const firebase = createFirebaseNamespaceLite();
 
 registerCoreComponents('lite');
 
diff --git a/packages/app-compat/src/index.ts b/packages/app-compat/src/index.ts
index 2a3ae0a9a84..42b5f5a154a 100644
--- a/packages/app-compat/src/index.ts
+++ b/packages/app-compat/src/index.ts
@@ -39,7 +39,7 @@ if (isBrowser() && (self as any).firebase !== undefined) {
   }
 }
 
-export const firebase = firebaseNamespace;
+const firebase = firebaseNamespace;
 
 registerCoreComponents();
 
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
index eaf55e65f55..eaf5cc9723c 100644
--- a/packages/firestore/package.json
+++ b/packages/firestore/package.json
@@ -45,6 +45,16 @@
     "test:prepare": "node ./scripts/prepare-test.js",
     "typings:public": "node ../../scripts/exp/use_typings.js ./dist/index.d.ts"
   },
+  "exports": {
+    ".": {
+      "node": "./dist/index.node.cjs.js",
+      "default": "./dist/index.esm2017.js"
+    },
+    "./lite": {
+      "node": "./dist/lite/index.node.cjs.js",
+      "default": "./dist/lite/index.browser.esm2017.js"
+    }
+  },
   "main": "dist/index.node.cjs.js",
   "main-esm": "dist/index.node.cjs.esm2017.js",
   "react-native": "dist/index.rn.js",
diff --git a/packages/functions-compat/src/callable.test.ts b/packages/functions-compat/src/callable.test.ts
index bd7f70b9e98..cf7c58090fe 100644
--- a/packages/functions-compat/src/callable.test.ts
+++ b/packages/functions-compat/src/callable.test.ts
@@ -17,7 +17,7 @@
 import { expect } from 'chai';
 import { FunctionsErrorCode } from '@firebase/functions';
 import { createTestService } from '../test/utils';
-import { firebase, FirebaseApp } from '@firebase/app-compat';
+import firebase, { FirebaseApp } from '@firebase/app-compat';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 export const TEST_PROJECT = require('../../../config/project.json');
diff --git a/packages/functions-compat/src/index.node.ts b/packages/functions-compat/src/index.node.ts
index f560f4aa251..e7b3c108ac4 100644
--- a/packages/functions-compat/src/index.node.ts
+++ b/packages/functions-compat/src/index.node.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { firebase } from '@firebase/app-compat';
+import firebase from '@firebase/app-compat';
 import { name, version } from '../package.json';
 import { registerFunctions } from './register';
 
diff --git a/packages/functions-compat/src/service.test.ts b/packages/functions-compat/src/service.test.ts
index 4ff312dd246..5a77e16b8e2 100644
--- a/packages/functions-compat/src/service.test.ts
+++ b/packages/functions-compat/src/service.test.ts
@@ -17,7 +17,7 @@
 import { expect, use } from 'chai';
 import { createTestService } from '../test/utils';
 import { FunctionsService } from './service';
-import { firebase, FirebaseApp } from '@firebase/app-compat';
+import firebase, { FirebaseApp } from '@firebase/app-compat';
 import * as functionsExp from '@firebase/functions';
 import { stub, match, SinonStub } from 'sinon';
 import * as sinonChai from 'sinon-chai';