diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index 76be16e..2e6a920 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -40,5 +40,5 @@ jobs:
           firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_SCHEMESSG_V3_DEV }}
           channelId: live
           projectId: schemessg-v3-dev
-          entryPoint: ./frontend
-          target: schemessg-v3-dev  # for staging
+          target: staging
+          entryPoint: .
diff --git a/frontend/.firebaserc b/frontend/.firebaserc
index 53ae6b3..7503196 100644
--- a/frontend/.firebaserc
+++ b/frontend/.firebaserc
@@ -1,5 +1,16 @@
 {
   "projects": {
     "default": "schemessg-v3-dev"
-  }
-}
+  },
+  "targets": {
+    "schemessg-v3-dev": {
+      "hosting": {
+        "staging": [
+          "schemessg-v3-dev"
+        ]
+      }
+    }
+  },
+  "etags": {},
+  "dataconnectEmulatorConfig": {}
+}
\ No newline at end of file
diff --git a/frontend/firebase.json b/frontend/firebase.json
index 301a18a..e39f969 100644
--- a/frontend/firebase.json
+++ b/frontend/firebase.json
@@ -1,15 +1,12 @@
 {
   "hosting": {
-    "target": "schemessg-v3-dev",
-    "public": "out",
+    "target": "staging",
+    "public": "frontend/out",
     "ignore": [
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
     ],
-    "frameworksBackend": {
-      "region": "asia-east1"
-    },
     "rewrites": [
       {
         "source": "**",