diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index 8f3eea4..2b6b941 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -15,6 +15,7 @@ jobs:
         with:
           channel: stable
           flutter-version: 3.29.3
+          cache: true
       - run: flutter pub get
       - run: flutter build web --wasm
       - uses: FirebaseExtended/action-hosting-deploy@v0
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
index f52463a..27cdc6e 100644
--- a/.github/workflows/firebase-hosting-pull-request.yml
+++ b/.github/workflows/firebase-hosting-pull-request.yml
@@ -17,6 +17,7 @@ jobs:
         with:
           channel: stable
           flutter-version: 3.29.3
+          cache: true
       - run: flutter pub get
       - run: flutter build web --wasm
       - uses: FirebaseExtended/action-hosting-deploy@v0
diff --git a/firebase.json b/firebase.json
index 9535fe4..6603732 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,13 +1,16 @@
 {
   "hosting": {
-    "source": ".",
+    "public": "build/web",
     "ignore": [
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
     ],
-    "frameworksBackend": {
-      "region": "asia-east1"
-    }
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
   }
-}
\ No newline at end of file
+}