diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9f64841e..373a1485 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,13 +93,21 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Cache Firebase emulators
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/firebase/emulators
+          key: ${{ runner.os }}-firebase-emulators-${{ hashFiles('.github/workflows/release.yml') }}
+          restore-keys: |
+            ${{ runner.os }}-firebase-emulators-
+
       - name: Install Firebase CLI
         uses: nick-invision/retry@v3
         with:
           timeout_minutes: 10
           retry_wait_seconds: 60
           max_attempts: 3
-          command: npm i -g firebase-tools@14
+          command: npm i -g firebase-tools@latest
 
       - name: Run tests with emulator
         run: pnpm test:emulator
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2590a05c..37147853 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -92,13 +92,21 @@ jobs:
           sudo apt-get install -y openjdk-17-jdk
           java -version
 
+      - name: Cache Firebase emulators
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/firebase/emulators
+          key: ${{ runner.os }}-firebase-emulators-${{ hashFiles('.github/workflows/tests.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-firebase-emulators-
+
       - name: Install Firebase CLI
         uses: nick-invision/retry@v3
         with:
           timeout_minutes: 10
           retry_wait_seconds: 60
           max_attempts: 3
-          command: npm i -g firebase-tools@14
+          command: npm i -g firebase-tools@latest
 
       # Determine which packages have changed
       - name: Determine changed packages
diff --git a/firebase.json b/firebase.json
index 93a77ec3..c6f7bf22 100644
--- a/firebase.json
+++ b/firebase.json
@@ -12,6 +12,9 @@
     "database": {
       "port": 9000
     },
+    "dataconnect": {
+      "port": 9399
+    },
     "ui": {
       "enabled": true
     }