diff --git a/.github/workflows/chrome-extension-release.yml b/.github/workflows/chrome-extension-release.yml
deleted file mode 100644
index 000ed2d..0000000
--- a/.github/workflows/chrome-extension-release.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Chrome Extension Release
-on:
-  push:
-    paths:
-      - "Extension/**"
-    tags:
-      - '*'
-  workflow_dispatch:
-jobs:
-  chrome-extension-release:
-    permissions: write-all
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: Extension
-    steps:
-      - uses: actions/checkout@v3
-      # Set Current Date As Env Variable
-      - name: Set current date as env variable
-        run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
-
-      # Set Repository Name As Env Variable
-      - name: Set repository name as env variable
-        run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
-
-      - name: Use Node.
-        uses: actions/setup-node@v2.1.5
-        with:
-          node-version: 16
-
-      - name: Create file
-        run: |
-          mkdir ./src/configs
-          cat > /home/runner/work/Brain/Brain/Extension/src/configs/firebase-config.json
-
-      - name: Putting data
-        env:
-          DATA: ${{ secrets.FIREBASE_CONFIGS }}
-        run: echo $DATA > /home/runner/work/Brain/Brain/Extension/src/configs/firebase-config.json
-
-      - name: Install Dependencies
-        run: npm ci
-
-      - name: Build
-        run: |
-          npm run build
-          ls zip/
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.date_today }} - ${{ env.repository_name }} - Chrome Extension release generated
-          path: Extension/zip/
-
-      - name: Create Release
-        id: create_extension_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}-chrome
-          release_name: Release Chrome Extension ${{ github.ref }}
-          draft: false
-          prerelease: false
-
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_extension_release.outputs.upload_url }}
-          asset_path: Extension/zip/rising-browser-1.0.0.zip
-          asset_name: chrome-extension.zip
-          asset_content_type: application/zip
\ No newline at end of file
diff --git a/.github/workflows/android-release.yml b/.github/workflows/release_ci.yml
similarity index 66%
rename from .github/workflows/android-release.yml
rename to .github/workflows/release_ci.yml
index 6bb5333..6b88f4b 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/release_ci.yml
@@ -9,7 +9,7 @@ on:
       - '*'
   workflow_dispatch:
 jobs:
-  build:
+  build-android:
     permissions: write-all
     runs-on: ubuntu-latest
     defaults:
@@ -92,6 +92,59 @@ jobs:
           name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated
           path: ${{ env.main_project_module }}/build/outputs/bundle/release/
 
+  chrome-extension-build:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: Extension
+    steps:
+      - uses: actions/checkout@v3
+      # Set Current Date As Env Variable
+      - name: Set current date as env variable
+        run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      # Set Repository Name As Env Variable
+      - name: Set repository name as env variable
+        run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
+      - name: Use Node.
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: 16
+
+      - name: Create file
+        run: |
+          mkdir ./src/configs
+          cat > /home/runner/work/Brain/Brain/Extension/src/configs/firebase-config.json
+
+      - name: Putting data
+        env:
+          DATA: ${{ secrets.FIREBASE_CONFIGS }}
+        run: echo $DATA > /home/runner/work/Brain/Brain/Extension/src/configs/firebase-config.json
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Build
+        run: |
+          npm run build
+          ls zip/
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.date_today }} - ${{ env.repository_name }} - Chrome Extension release generated
+          path: Extension/zip/
+
+  release:
+    needs: [build-android]
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download All Artifacts
+        uses: actions/download-artifact@v3
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -103,7 +156,7 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload Release Asset
+      - name: Upload Android Release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -111,4 +164,15 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: Android/${{ env.main_project_module }}/build/outputs/apk/debug/app-debug.apk # Update this with the correct APK path
           asset_name: app-release-unsigned.apk
-          asset_content_type: application/vnd.android.package-archive
\ No newline at end of file
+          asset_content_type: application/vnd.android.package-archive
+
+      - name: Upload Chrome Extension Release
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: Extension/zip/rising-browser-1.0.0.zip
+          asset_name: chrome-extension.zip
+          asset_content_type: application/zip
\ No newline at end of file