diff --git a/.firebaserc b/.firebaserc
index ebc05b1..6f08c5b 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,17 +1,18 @@
 {
   "projects": {
-    "default": "gug-web"
+    "default": "gug-web-2023"
   },
   "targets": {
-    "gug-web": {
+    "gug-web-2023": {
       "hosting": {
         "staging": [
-          "staging-gug"
+          "staging-gug-web"
         ],
-        "production":[
-            "public-gug"
+        "production": [
+          "gug-web-2023"
         ]
-        }
       }
     }
-  }
+  },
+  "etags": {}
+}
\ No newline at end of file
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index 0fc996d..b857282 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -17,9 +17,9 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GUG_WEB }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GUG_WEB_2023 }}'
           channelId: live
           target: staging
-          projectId: gug-web
+          projectId: gug-web-2023
         env:
           FIREBASE_CLI_PREVIEWS: hostingchannels
diff --git a/.github/workflows/firebase-hosting-production-merge.yml b/.github/workflows/firebase-hosting-production-merge.yml
index fcea798..2d489d8 100644
--- a/.github/workflows/firebase-hosting-production-merge.yml
+++ b/.github/workflows/firebase-hosting-production-merge.yml
@@ -17,9 +17,9 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GUG_WEB }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GUG_WEB_2023 }}'
           channelId: live
           target: production
-          projectId: gug-web
+          projectId: gug-web-2023
         env:
           FIREBASE_CLI_PREVIEWS: hostingchannels
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
index 0501bd1..6201cae 100644
--- a/.github/workflows/firebase-hosting-pull-request.yml
+++ b/.github/workflows/firebase-hosting-pull-request.yml
@@ -14,8 +14,8 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GUG_WEB }}'
-          projectId: gug-web
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GUG_WEB_2023 }}'
+          projectId: gug-web-2023
           target: staging
           expires: 7d
         env: