diff --git a/.firebaserc b/.firebaserc
index b3a0ab14..2ad874d6 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -2,7 +2,8 @@
   "projects": {
     "development": "dev-lmm-oa-sws",
     "staging": "staging-lmm-oa-sws",
-    "production": "lmm-oa-sws"
+    "production": "lmm-oa-sws",
+    "default": "lmm-oa-sws"
   },
   "targets": {}
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index 2d4cc07f..2efd0571 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -18,15 +18,6 @@ jobs:
         node-version: [16.x]
 
     steps:
-      - name: Checkout for firebase deployment
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-        with:
-          repository: danielmillan/pipelines-firebase-hosting
-          ref: '1.0.8'
-          token: ${{ secrets.GH_TOKEN }}
-          persist-credentials: false
-          path: ./.github/actions/pipelines-firebase-hosting
-
       - name: Checkout for release preparation
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
         with:
@@ -54,8 +45,7 @@ jobs:
 
       - name: Deploy to Firebase
         if: ${{ steps.check_build.outputs.files_exists == 'true' }}
-        uses: ./.github/actions/pipelines-firebase-hosting
-        with:
-          firebase-token: ${{ secrets.FIREBASE_TOKEN }}
-          resources-name: build
-          project-name: ${{ secrets.FIREBASE_PROJECT }}
+        uses: doonstore/firebase-deploy@3c07a0714007ef3bec30f35ed62f43b13cf48ad5
+        env:
+          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          FIREBASE_PROJECT: ${{ secrets.FIREBASE_PROJECT }}
diff --git a/.github/workflows/rebuild-deploy-dev.yml b/.github/workflows/rebuild-deploy-dev.yml
index d2922442..0f8989a0 100644
--- a/.github/workflows/rebuild-deploy-dev.yml
+++ b/.github/workflows/rebuild-deploy-dev.yml
@@ -18,15 +18,6 @@ jobs:
         node-version: [16.x]
 
     steps:
-      - name: Checkout for firebase deployment
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
-        with:
-          repository: danielmillan/pipelines-firebase-hosting
-          ref: '1.0.8'
-          token: ${{ secrets.GH_TOKEN }}
-          persist-credentials: false
-          path: ./.github/actions/pipelines-firebase-hosting
-
       - name: Checkout for release preparation
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
         with:
@@ -52,8 +43,7 @@ jobs:
 
       - name: Deploy to Firebase
         if: ${{ steps.check_build.outputs.files_exists == 'true' }}
-        uses: ./.github/actions/pipelines-firebase-hosting
-        with:
-          firebase-token: ${{ secrets.FIREBASE_TOKEN }}
-          resources-name: build
-          project-name: ${{ secrets.FIREBASE_PROJECT }}
+        uses: doonstore/firebase-deploy@3c07a0714007ef3bec30f35ed62f43b13cf48ad5
+        env:
+          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+          FIREBASE_PROJECT: ${{ secrets.FIREBASE_PROJECT }}
diff --git a/firebase.json b/firebase.json
index da59512f..340ed5b7 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,12 +1,16 @@
 {
-	"hosting": {
-		"public": "public",
-		"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
-		"rewrites": [
-			{
-				"source": "**",
-				"destination": "/index.html"
-			}
-		]
-	}
+  "hosting": {
+    "public": "build",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
 }