diff --git a/.firebaserc b/.firebaserc
index c67b671..d01250d 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,16 +1,16 @@
 {
   "targets": {
-    "applied-abbey-378009": {
+    "rayon-gcp-starter": {
       "hosting": {
         "prod": [
-          "rayon-react-starter"
+          "rayon-gcp-starter"
         ]
       }
     },
-    "physikomatics-be": {
+    "rayon-gcp-starter": {
       "hosting": {
         "dev": [
-          "rayon-react-starter-dev"
+          "rayon-gcp-starter"
         ]
       }
     }
diff --git a/.github/workflows/firebase-hosting-merge-dev.yml b/.github/workflows/firebase-hosting-merge-dev.yml
index f06361e..29bd95e 100644
--- a/.github/workflows/firebase-hosting-merge-dev.yml
+++ b/.github/workflows/firebase-hosting-merge-dev.yml
@@ -1,8 +1,10 @@
-name: Deploy to Firebase Hosting on merge (dev)
+name: Deploy to Firebase Hosting - Dev
 "on":
   push:
     branches:
       - dev
+  workflow_dispatch:
+
 jobs:
   build_and_deploy:
     permissions: write-all
@@ -28,7 +30,7 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_DEV }}"
+          firebaseServiceAccount: "${{ secrets.SECRETJSON_DEV }}"
           channelId: live
-          projectId: physikomatics-be
+          projectId: rayon-gcp-starter
           target: dev
diff --git a/.github/workflows/firebase-hosting-merge-main.yml b/.github/workflows/firebase-hosting-merge-main.yml
index 25c1934..62fa129 100755
--- a/.github/workflows/firebase-hosting-merge-main.yml
+++ b/.github/workflows/firebase-hosting-merge-main.yml
@@ -1,8 +1,10 @@
-name: Deploy to Firebase Hosting on merge (main)
+name: Deploy to Firebase Hosting - Prod
 "on":
   push:
     branches:
       - main
+  workflow_dispatch:
+
 jobs:
   build_and_deploy:
     permissions: write-all
@@ -28,7 +30,7 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_PROD }}"
+          firebaseServiceAccount: "${{ secrets.SECRETJSON_PROD }}"
           channelId: live
-          projectId: applied-abbey-378009
+          projectId: rayon-gcp-starter
           target: prod
diff --git a/.github/workflows/firebase-hosting-pull-request-dev.yml b/.github/workflows/firebase-hosting-pull-request-dev.yml
new file mode 100644
index 0000000..2ac6539
--- /dev/null
+++ b/.github/workflows/firebase-hosting-pull-request-dev.yml
@@ -0,0 +1,19 @@
+name: Preview deploy to Firebase Hosting on PR (dev)
+on:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  build_and_preview:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn install --frozen-lockfile && npm run build:dev
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          firebaseServiceAccount: "${{ secrets.SECRETJSON_DEV }}"
+          projectId: rayon-gcp-starter
+          target: dev
diff --git a/.github/workflows/firebase-hosting-pull-request-main.yml b/.github/workflows/firebase-hosting-pull-request-main.yml
new file mode 100644
index 0000000..4c17ba7
--- /dev/null
+++ b/.github/workflows/firebase-hosting-pull-request-main.yml
@@ -0,0 +1,19 @@
+name: Preview deploy to Firebase Hosting on PR (main)
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build_and_preview:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn install --frozen-lockfile && npm run build:prod
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          firebaseServiceAccount: "${{ secrets.SECRETJSON_PROD }}"
+          projectId: rayon-gcp-starter
+          target: prod
diff --git a/README.md b/README.md
index 53b753d..84da5df 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Rayon React Starter is an opinionated starter kit designed to scaffold React projects quickly with a comprehensive and well-structured environment. Built with a modern tech stack and batteries included, it helps you start building your project in no time.
 
-[Live Demo](https://rayon-react-starter.web.app/)
+[Live Demo](https://fe.starters.rayonstudios.com/)
 
 ## Tech Stack
 
@@ -44,7 +44,7 @@ Ensure you have the following installed:
 1. Clone the repository:
     ```bash
     git clone https://github.com/rayonstudios/rayon_react_starter
-    cd rayon-react-starter
+    cd rayon-gcp-starter
     ```
 2. Install dependencies:
     ```bash
diff --git a/package.json b/package.json
index 282b095..42b525c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "rayon_react_starter",
   "private": true,
-  "version": "0.0.3",
+  "version": "1.4",
+  "description": "Rayon React Starter is an opinionated starter kit designed to scaffold React projects quickly with a comprehensive and well-structured environment. Built with a modern tech stack and batteries included, it helps you start building your project in no time.",
   "type": "module",
   "scripts": {
     "dev": "vite",