diff --git a/.firebaserc b/.firebaserc
index 4ca6a06bb..94b2b6c4b 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,5 +1,5 @@
 {
   "projects": {
-    "default": "cxl-jwp-app"
+    "default": "ott-web-app-9765c"
   }
 }
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
new file mode 100644
index 000000000..9a2f99aa5
--- /dev/null
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -0,0 +1,19 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - develop
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_OTT_WEB_APP_9765C }}'
+          channelId: live
+          projectId: ott-web-app-9765c
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
new file mode 100644
index 000000000..0e9167c28
--- /dev/null
+++ b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,18 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request_target
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ github.token }}
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_OTT_WEB_APP_9765C }}'
+          projectId: ott-web-app-9765c
diff --git a/.github/workflows/release-deploy-prod-demo.yml b/.github/workflows/release-deploy-prod-demo.yml
index c4186efb3..dd6073f47 100644
--- a/.github/workflows/release-deploy-prod-demo.yml
+++ b/.github/workflows/release-deploy-prod-demo.yml
@@ -18,5 +18,5 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_OTT_WEB_APP_9765C }}'
           channelId: live
diff --git a/.github/workflows/test-preview-and-lighthouse.yml b/.github/workflows/test-preview-and-lighthouse.yml
index f6e304754..e97a2a772 100644
--- a/.github/workflows/test-preview-and-lighthouse.yml
+++ b/.github/workflows/test-preview-and-lighthouse.yml
@@ -13,13 +13,13 @@ jobs:
       - uses: actions/checkout@v3
       - name: Build Preview Link
         env:
-          APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }}
+          APP_PLAYER_LICENSE_KEY: ${{ secrets.APP_PLAYER_LICENSE_KEY }}
         run: yarn && MODE=preview yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         id: firebase_hosting_preview
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_OTT_WEB_APP_9765C }}'
           expires: 30d
 
   lhci:
diff --git a/firebase.json b/firebase.json
index f5b1779d3..9c321cfb3 100644
--- a/firebase.json
+++ b/firebase.json
@@ -13,8 +13,7 @@
     ],
     "headers": [
       {
-        "source":
-        "**/*.@(jpg|jpeg|gif|png|svg|webp|js|css|eot|otf|ttf|ttc|woff|woff2|font.css)",
+        "source": "**/*.@(jpg|jpeg|gif|png|svg|webp|js|css|eot|otf|ttf|ttc|woff|woff2|font.css)",
         "headers": [
           {
             "key": "Cache-Control",