diff --git a/.github/workflows/cloud-frontend-gcp.yml b/.github/workflows/cloud-frontend-gcp.yml
deleted file mode 100644
index f3119c4ac1..0000000000
--- a/.github/workflows/cloud-frontend-gcp.yml
+++ /dev/null
@@ -1,189 +0,0 @@
-name: Deploy to cloud frontend stage
-
-on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Git branch to deploy (must start with "lts-", e.g., lts-3.6)'
-        required: true
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: ✅ Check user authorization
-        run: |
-          allowed_user1=${{ secrets.ALLOWED_USER1_USERNAME }}
-          allowed_user2=${{ secrets.ALLOWED_USER2_USERNAME }}
-          allowed_user3=${{ secrets.ALLOWED_USER3_USERNAME }}
-
-          if [[ "${{ github.actor }}" != "$allowed_user1" && \
-                "${{ github.actor }}" != "$allowed_user2" && \
-                "${{ github.actor }}" != "$allowed_user3" ]]; then
-            echo "❌ User '${{ github.actor }}' is not authorized to trigger this workflow."
-            exit 1
-          else
-            echo "✅ User '${{ github.actor }}' is authorized."
-          fi
-
-      - name: 📥 Manual Git checkout with submodules
-        run: |
-          set -e
-
-          BRANCH="${{ github.event.inputs.branch }}"
-          REPO="https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/${{ github.repository }}"
-
-          git config --global url."https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/"
-          git config --global http.version HTTP/1.1
-          git config --global http.postBuffer 524288000
-
-          echo "👉 Cloning $REPO (branch: $BRANCH)"
-          git clone --recurse-submodules --depth=1 --branch "$BRANCH" "$REPO" repo
-          cd repo
-
-          echo "🔎 Main repo: verifying checkout"
-          MAIN_CURRENT=$(git rev-parse --abbrev-ref HEAD)
-          echo "✅ Main repo: successfully checked out branch $MAIN_CURRENT"
-          echo "📍 Main repo: current commit $(git rev-parse --short HEAD): $(git log -1 --pretty=%s)"
-
-          echo "🔁 Updating submodules"
-          git submodule update --init --recursive
-
-          echo "🔀 Attempting to checkout '$BRANCH' in each submodule and validating"
-
-          BRANCH="$BRANCH" git submodule foreach --recursive bash -c '
-            name="$sm_path"
-            echo ""
-            echo "Entering '\''$name'\''"
-            echo "↪ $name: trying to checkout branch '\''$BRANCH'\''"
-
-            if git ls-remote --exit-code --heads origin "$BRANCH" >/dev/null; then
-              git fetch origin "$BRANCH:$BRANCH" || {
-                echo "❌ $name: fetch failed for $BRANCH"
-                exit 1
-              }
-
-              PREV=$(git rev-parse --short HEAD || echo "unknown")
-              git checkout "$BRANCH" || {
-                echo "❌ $name: checkout failed for $BRANCH"
-                exit 1
-              }
-
-              echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
-              echo "✅ $name: checked out branch $BRANCH"
-            else
-              echo "⚠️ $name: branch '$BRANCH' not found on origin. Falling back to 'lts-3.16'"
-              PREV=$(git rev-parse --short HEAD || echo "unknown")
-              git fetch origin lts-3.16:lts-3.16 || {
-                echo "❌ $name: fetch failed for lts-3.16"
-                exit 1
-              }
-              git checkout lts-3.16 || {
-                echo "❌ $name: fallback to lts-3.16 failed"
-                exit 1
-              }
-              echo "Previous HEAD position was $PREV: $(git log -1 --pretty=%s || echo 'unknown')"
-              echo "✅ $name: now on branch lts-3.16"
-            fi
-
-            CURRENT=$(git rev-parse --abbrev-ref HEAD)
-            echo "🔎 $name: current branch = $CURRENT"
-            if [ "$CURRENT" != "$BRANCH" ] && [ "$CURRENT" != "lts-3.16" ]; then
-              echo "❌ $name: unexpected branch state — wanted '$BRANCH' or fallback 'lts-3.16', got '$CURRENT'"
-              exit 1
-            fi
-          '
-
-      - name: 🧰 Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: 22.15.1
-
-      - name: 📦 Install dependencies
-        run: npm install
-        working-directory: repo
-
-      - name: 🛠️ Build the project
-        run: npm run build:plugins:prod && npm run build:frontend
-        working-directory: repo
-        env:
-          GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }}
-          NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }}
-          NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }}
-          SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }}
-          SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }}
-          TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
-          TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
-          TOOLJET_EDITION: cloud
-          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/signup
-
-      - name: 🚀 Deploy to Netlify
-        run: |
-          npm install -g netlify-cli
-          netlify deploy --prod --dir=frontend/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.CLOUD_NETLIFY_SITE_ID }}
-        working-directory: repo
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }}
-          NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }}
-          NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }}
-          SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }}
-          SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }}
-          TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
-          TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
-          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/signup
-          TOOLJET_EDITION: cloud
-
-  Purge_Cloudflare_Cache:
-    needs: deploy
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: ✅ Check user authorization
-        run: |
-          allowed_user1=${{ secrets.ALLOWED_USER1_USERNAME }}
-          allowed_user2=${{ secrets.ALLOWED_USER2_USERNAME }}
-          allowed_user3=${{ secrets.ALLOWED_USER3_USERNAME }}
-
-          if [[ "${{ github.actor }}" != "$allowed_user1" && \
-                "${{ github.actor }}" != "$allowed_user2" && \
-                "${{ github.actor }}" != "$allowed_user3" ]]; then
-            echo "❌ User '${{ github.actor }}' is not authorized to trigger this workflow."
-            exit 1
-          else
-            echo "✅ User '${{ github.actor }}' is authorized."
-          fi
-
-      - name: 🧹 Purge Cloudflare Cache
-        continue-on-error: true
-        run: |
-          echo "🔄 Purging Cloudflare cache for specific URLs..."
-          response=$(curl -s -w "\n%{http_code}" -X POST \
-            "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE_ID_PROD }}/purge_cache" \
-            -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN_PROD }}" \
-            -H "Content-Type: application/json" \
-            --data '{
-              "files": [
-                "${{ secrets.CLOUDFLARE_CONFIG_URL_STAGE }}",
-                "${{ secrets.CLOUDFLARE_METADATA_URL_STAGE }}"
-              ]
-            }')
-
-          http_code=$(echo "$response" | tail -n1)
-          body=$(echo "$response" | sed '$d')
-
-          if [ "$http_code" = "200" ]; then
-            echo "✅ Cloudflare cache purged successfully for specified URLs"
-            echo "$body"
-          else
-            echo "⚠️ Cloudflare cache purge failed with status code: $http_code"
-            echo "$body"
-            exit 1
-          fi
diff --git a/.github/workflows/deploy-to-stage.yml b/.github/workflows/deploy-to-stage.yml
index abdb6804be..29f56f4c4b 100644
--- a/.github/workflows/deploy-to-stage.yml
+++ b/.github/workflows/deploy-to-stage.yml
@@ -4,18 +4,18 @@ on:
   workflow_dispatch:
     inputs:
       branch_name:
-        description: 'Git branch to build from'
+        description: "Git branch to build from"
         required: true
-        default: 'lts-3.16'
+        default: "lts-3.16"
       dockerfile_path:
-        description: 'Path to Dockerfile'
+        description: "Path to Dockerfile"
         required: true
-        default: './docker/LTS/cloud/cloud-server.Dockerfile'
+        default: "./docker/LTS/cloud/cloud-server.Dockerfile"
         type: choice
         options:
           - ./docker/LTS/cloud/cloud-server.Dockerfile
       docker_tag:
-        description: 'Docker tag suffix (e.g., cloud-staging-v14)'
+        description: "Docker tag suffix (e.g., cloud-staging-v14)"
         required: true
 
 jobs:
@@ -47,7 +47,7 @@ jobs:
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
           sudo docker system prune -af
           sudo apt-get clean
-          df -h          
+          df -h
 
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -92,7 +92,7 @@ jobs:
             BRANCH_NAME=${{ github.event.inputs.branch_name }}
 
       - name: Show the full Docker tag
-        run: | 
+        run: |
           echo "✅ Docker image tagged as: $IMAGE_TAG"
 
       # Deploy to AKS
@@ -155,7 +155,7 @@ jobs:
         run: |
           set -e
 
-          BRANCH="${{ github.event.inputs.branch_name }}"
+          BRANCH="${{ github.event.inputs.branch }}"
           REPO="https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/${{ github.repository }}"
 
           git config --global url."https://x-access-token:${{ secrets.CUSTOM_GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/"
@@ -229,7 +229,7 @@ jobs:
         working-directory: repo
 
       - name: 🛠️ Build the project
-        run: npm run build:plugins:prod && npm run build:frontend
+        run: npm run build:plugins:prod && npm run build:frontend:cloud
         working-directory: repo
         env:
           GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }}
@@ -243,24 +243,38 @@ jobs:
           TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
           TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
           TOOLJET_EDITION: cloud
-          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account
+          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/signup
 
-      - name: 🚀 Deploy to Netlify
+      - name: 📝 Add SPA routing redirect rule
+        run: echo "/* /index.html 200" > repo/frontend/build/_redirects
+
+      - name: 🔧 Set CF Pages production branch to input branch
         run: |
-          npm install -g netlify-cli
-          netlify deploy --prod --dir=frontend/build --auth=$NETLIFY_AUTH_TOKEN --site=${{ secrets.CLOUD_NETLIFY_SITE_ID }}
+          echo "🔄 Updating CF Pages production branch to: ${{ github.event.inputs.branch }}"
+          response=$(curl -s -w "\n%{http_code}" -X PATCH \
+            "https://api.cloudflare.com/client/v4/accounts/${{ secrets.CF_PAGES_ACCOUNT_ID }}/pages/projects/${{ secrets.CF_PAGES_PROJECT_NAME }}" \
+            -H "Authorization: Bearer ${{ secrets.CF_PAGES_API_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            --data '{"production_branch": "${{ github.event.inputs.branch }}"}')
+
+          http_code=$(echo "$response" | tail -n1)
+          if [ "$http_code" = "200" ]; then
+            echo "✅ Production branch updated to: ${{ github.event.inputs.branch }}"
+          else
+            echo "❌ Failed to update production branch (HTTP $http_code)"
+            echo "$response"
+            exit 1
+          fi
+
+      - name: 🚀 Deploy to Cloudflare Pages
+        run: |
+          echo "📦 Built from source branch: ${{ github.event.inputs.branch }}"
+          echo "🎯 Targeting CF Pages production slot (branch alias: ${{ github.event.inputs.branch }})"
+          npx wrangler pages deploy frontend/build \
+            --project-name=${{ secrets.CF_PAGES_PROJECT_NAME }} \
+            --branch=${{ github.event.inputs.branch }} \
+            --commit-dirty=true
         working-directory: repo
         env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          GOOGLE_MAPS_API_KEY: ${{ secrets.CLOUD_GOOGLE_MAPS_API_KEY }}
-          NODE_ENV: ${{ secrets.CLOUD_NODE_ENV }}
-          NODE_OPTIONS: ${{ secrets.CLOUD_NODE_OPTIONS }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.CLOUD_SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.CLOUD_SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.CLOUD_SENTRY_PROJECT }}
-          SERVE_CLIENT: ${{ secrets.CLOUD_SERVE_CLIENT }}
-          SERVER_IP: ${{ secrets.CLOUD_SERVER_IP }}
-          TJDB_SQL_MODE_DISABLE: ${{ secrets.CLOUD_TJDB_SQL_MODE_DISABLE }}
-          TOOLJET_SERVER_URL: ${{ secrets.CLOUD_TOOLJET_SERVER_URL }}
-          WEBSITE_SIGNUP_URL: https://website-stage.tooljet.ai/ai-create-account
-          TOOLJET_EDITION: cloud
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CF_PAGES_API_TOKEN }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_PAGES_ACCOUNT_ID }}