diff --git a/.env.example b/.env.example
index 12fef8623..d8f6ce111 100644
--- a/.env.example
+++ b/.env.example
@@ -17,19 +17,19 @@ SUPABASE_ANON_KEY=
 SUPABASE_PUBLIC_URL=
 
 # Next.js Public Variables (Frontend)
-NEXT_PUBLIC_API_URL=
-NEXT_PUBLIC_API2_URL=
-NEXT_PUBLIC_WEB_SOCKET_URL=
-NEXT_PUBLIC_URL=
-NEXT_PUBLIC_SUPABASE_URL=
-NEXT_PUBLIC_SUPABASE_ANON_KEY=
-NEXT_PUBLIC_WS_URL=
-NEXT_PUBLIC_POSTHOG_KEY=
-NEXT_PUBLIC_POSTHOG_HOST=
+VITE_PUBLIC_API_URL=
+VITE_PUBLIC_API2_URL=
+VITE_PUBLIC_WEB_SOCKET_URL=
+VITE_PUBLIC_URL=
+VITE_PUBLIC_SUPABASE_URL=
+VITE_PUBLIC_SUPABASE_ANON_KEY=
+VITE_PUBLIC_WS_URL=
+VITE_PUBLIC_POSTHOG_KEY=
+VITE_PUBLIC_POSTHOG_HOST=
 
 # Next.js Private Variables
-NEXT_SLACK_APP_SUPPORT_URL=
-NEXT_PRIVATE_SUPABASE_SERVICE_ROLE_KEY=
+VITE_SLACK_APP_SUPPORT_URL=
+VITE_PRIVATE_SUPABASE_SERVICE_ROLE_KEY=
 
 # Server Configuration
 SERVER_PORT=3000
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 315a04697..2303e0885 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -177,11 +177,11 @@ jobs:
             ${{ env.DOCKER_REGISTRY_OWNER }}/${{ env.WEB_IMAGE_NAME }}:${{ github.sha }}-${{ matrix.platform }}
             ${{ env.DOCKER_REGISTRY_OWNER }}/${{ env.WEB_IMAGE_NAME }}:latest-${{ matrix.platform }}
           build-args: |
-            NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}
-            NEXT_PUBLIC_URL=${{ secrets.NEXT_PUBLIC_URL }}
-            NEXT_PUBLIC_SUPABASE_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
-            NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
-            NEXT_PUBLIC_WEB_SOCKET_URL=${{ secrets.NEXT_PUBLIC_WEB_SOCKET_URL }}
+            VITE_PUBLIC_API_URL=${{ secrets.VITE_PUBLIC_API_URL }}
+            VITE_PUBLIC_URL=${{ secrets.VITE_PUBLIC_URL }}
+            VITE_PUBLIC_SUPABASE_URL=${{ secrets.VITE_PUBLIC_SUPABASE_URL }}
+            VITE_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.VITE_PUBLIC_SUPABASE_ANON_KEY }}
+            VITE_PUBLIC_WEB_SOCKET_URL=${{ secrets.VITE_PUBLIC_WEB_SOCKET_URL }}
       - name: Set Web Package Visibility to Public
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/web-e2e-tests-optimized.yml b/.github/workflows/web-e2e-tests-optimized.yml
index e7885d6f7..36d44dbd5 100644
--- a/.github/workflows/web-e2e-tests-optimized.yml
+++ b/.github/workflows/web-e2e-tests-optimized.yml
@@ -43,11 +43,11 @@ jobs:
         working-directory: ./web
         run: pnpm run build
         env:
-          NEXT_PUBLIC_API_URL: http://localhost:3001
-          NEXT_PUBLIC_URL: http://localhost:3000
-          NEXT_PUBLIC_SUPABASE_URL: http://127.0.0.1:54321
-          NEXT_PUBLIC_SUPABASE_ANON_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODIzNDMwOTZ9.7UIsMFfHYKxH7bUJCRfxd6lr7CSXGF7UxtZQO10FMMo"
-          NEXT_PUBLIC_WEB_SOCKET_URL: ws://localhost:3001
+          VITE_PUBLIC_API_URL: http://localhost:3001
+          VITE_PUBLIC_URL: http://localhost:3000
+          VITE_PUBLIC_SUPABASE_URL: http://127.0.0.1:54321
+          VITE_PUBLIC_SUPABASE_ANON_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODIzNDMwOTZ9.7UIsMFfHYKxH7bUJCRfxd6lr7CSXGF7UxtZQO10FMMo"
+          VITE_PUBLIC_WEB_SOCKET_URL: ws://localhost:3001
 
       - name: Archive Frontend Build
         working-directory: ./web
diff --git a/packages/supabase/.env.example b/packages/supabase/.env.example
index 165bea8bc..11a8b0176 100644
--- a/packages/supabase/.env.example
+++ b/packages/supabase/.env.example
@@ -15,12 +15,12 @@ SUPABASE_URL="http://kong:8000"
 SUPABASE_SERVICE_ROLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ey AgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q"
 
 # --- Web Client (Next.js) Specific ---
-NEXT_PUBLIC_API_URL="http://localhost:3001" # External URL for the API service (buster-api)
-NEXT_PUBLIC_URL="http://localhost:3000"      # External URL for the Web service (buster-web)
-NEXT_PUBLIC_SUPABASE_URL="http://kong:8000" # External URL for Supabase (Kong proxy)
-NEXT_PUBLIC_WS_URL="ws://localhost:3001"
-NEXT_PUBLIC_SUPABASE_ANON_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ey AgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE"
-NEXT_PRIVATE_SUPABASE_SERVICE_ROLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ey AgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q"
+VITE_PUBLIC_API_URL="http://localhost:3001" # External URL for the API service (buster-api)
+VITE_PUBLIC_URL="http://localhost:3000"      # External URL for the Web service (buster-web)
+VITE_PUBLIC_SUPABASE_URL="http://kong:8000" # External URL for Supabase (Kong proxy)
+VITE_PUBLIC_WS_URL="ws://localhost:3001"
+VITE_PUBLIC_SUPABASE_ANON_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ey AgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE"
+VITE_PRIVATE_SUPABASE_SERVICE_ROLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ey AgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q"
 
 #################################################
 # Supabase Stack Configuration Variables
diff --git a/packages/supabase/docker-compose.yml b/packages/supabase/docker-compose.yml
index 88c4f85ca..99a1359d7 100644
--- a/packages/supabase/docker-compose.yml
+++ b/packages/supabase/docker-compose.yml
@@ -50,11 +50,11 @@ services:
 
       LOGFLARE_API_KEY: ${LOGFLARE_API_KEY}
       LOGFLARE_URL: http://analytics:4000
-      NEXT_PUBLIC_ENABLE_LOGS: true
+      VITE_PUBLIC_ENABLE_LOGS: true
       # Comment to use Big Query backend for analytics
-      NEXT_ANALYTICS_BACKEND_PROVIDER: postgres
+      VITE_ANALYTICS_BACKEND_PROVIDER: postgres
       # Uncomment to use Big Query backend for analytics
-      # NEXT_ANALYTICS_BACKEND_PROVIDER: bigquery
+      # VITE_ANALYTICS_BACKEND_PROVIDER: bigquery
 
   kong:
     container_name: supabase-kong
diff --git a/turbo.json b/turbo.json
index 3a1f60fda..7e3b68b55 100644
--- a/turbo.json
+++ b/turbo.json
@@ -83,20 +83,20 @@
     "SUPABASE_ANON_KEY",
     "SUPABASE_PUBLIC_URL",
 
-    "NEXT_PUBLIC_API_URL",
-    "NEXT_PUBLIC_API2_URL",
-    "NEXT_PUBLIC_WEB_SOCKET_URL",
-    "NEXT_PUBLIC_URL",
-    "NEXT_PUBLIC_SUPABASE_URL",
-    "NEXT_PUBLIC_SUPABASE_ANON_KEY",
-    "NEXT_PUBLIC_WS_URL",
-    "NEXT_PUBLIC_POSTHOG_KEY",
-    "NEXT_PUBLIC_POSTHOG_HOST",
-    "NEXT_PUBLIC_POSTHOG_KEY",
-    "NEXT_PUBLIC_POSTHOG_HOST",
+    "VITE_PUBLIC_API_URL",
+    "VITE_PUBLIC_API2_URL",
+    "VITE_PUBLIC_WEB_SOCKET_URL",
+    "VITE_PUBLIC_URL",
+    "VITE_PUBLIC_SUPABASE_URL",
+    "VITE_PUBLIC_SUPABASE_ANON_KEY",
+    "VITE_PUBLIC_WS_URL",
+    "VITE_PUBLIC_POSTHOG_KEY",
+    "VITE_PUBLIC_POSTHOG_HOST",
+    "VITE_PUBLIC_POSTHOG_KEY",
+    "VITE_PUBLIC_POSTHOG_HOST",
 
-    "NEXT_SLACK_APP_SUPPORT_URL",
-    "NEXT_PRIVATE_SUPABASE_SERVICE_ROLE_KEY",
+    "VITE_SLACK_APP_SUPPORT_URL",
+    "VITE_PRIVATE_SUPABASE_SERVICE_ROLE_KEY",
 
     "SERVER_PORT",