diff --git a/.firebaserc b/.firebaserc
index 35201669..fb6c213b 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,8 +1,7 @@
 {
   "projects": {
-    "xdai": "xdai-omnibridge",
+    "production": "xdai-omnibridge",
     "sokol": "sokol-omnibridge",
     "staging": "omnibridge-staging",
-    "merge": "koal-personal"
   }
 }
diff --git a/.github/workflows/merge.yaml b/.github/workflows/production.yaml
similarity index 91%
rename from .github/workflows/merge.yaml
rename to .github/workflows/production.yaml
index 9ccfe1b3..44097f29 100644
--- a/.github/workflows/merge.yaml
+++ b/.github/workflows/production.yaml
@@ -1,12 +1,12 @@
-name: Build and Deploy to test merge
+name: Build and Deploy to production
 on:
   push:
     branches:
-      - rebase-20210204
+      - master
 
 jobs:
   deploy:
-    name: Build & Deploy to test merge
+    name: Build & Deploy to production
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
@@ -48,7 +48,7 @@ jobs:
       - name: Deploy to Firebase
         uses: w9jds/firebase-action@master
         with:
-          args: deploy --only hosting --project merge
+          args: deploy --only hosting --project production
         env:
           CI: true
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index c13ecb3a..1ccbe900 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -2,7 +2,7 @@ name: Build and Deploy xDai Staging
 on:
   push:
     branches:
-      - master
+      - staging
 
 jobs:
   deploy: