diff --git a/.github/workflows/manual_adhoc_web.yml b/.github/workflows/manual_adhoc_web.yml
index 30296bb0f34a..9e0b713bc8ab 100644
--- a/.github/workflows/manual_adhoc_web.yml
+++ b/.github/workflows/manual_adhoc_web.yml
@@ -45,6 +45,7 @@ jobs:
       MARK_TAGGED_VERSION: false
       ADHOC_NAME: ${{ github.event.inputs.ADHOC_NAME }}
       RRD_ARTIFACT_NAME: linux-rrd-fast
+      UPLOAD_COMMIT: false
     secrets: inherit
   
   build-web-demo-adhoc:
@@ -65,4 +66,5 @@ jobs:
       MARK_PRERELEASE_FOR_MAINLINE: false
       MARK_TAGGED_VERSION: false
       ADHOC_NAME: ${{ github.event.inputs.ADHOC_NAME }}
+      UPLOAD_COMMIT: false
     secrets: inherit
diff --git a/.github/workflows/manual_build_release.yml b/.github/workflows/manual_build_release.yml
index 171cc75ea079..4fa458534114 100644
--- a/.github/workflows/manual_build_release.yml
+++ b/.github/workflows/manual_build_release.yml
@@ -113,6 +113,26 @@ jobs:
       RRD_ARTIFACT_NAME: linux-rrd
       RELEASE_VERSION: ${{ github.event.inputs.RELEASE_VERSION }}
     secrets: inherit
+  
+  build-web-demo:
+    name: 'Build Web Demo'
+    needs: [build-linux, build-web]
+    uses: ./.github/workflows/reusable_build_web_demo.yml
+    with:
+      CONCURRENCY: manual-dispatch-${{ github.run_id}}
+      WHEEL_ARTIFACT_NAME: linux-wheel
+    secrets: inherit
+
+  upload-web-demo:
+    name: 'Upload Web'
+    needs: [build-web-demo]
+    uses: ./.github/workflows/reusable_upload_web_demo.yml
+    with:
+      CONCURRENCY: manual-dispatch-${{ github.run_id}}
+      MARK_PRERELEASE_FOR_MAINLINE: false
+      MARK_TAGGED_VERSION: true
+      RELEASE_VERSION: ${{ github.event.inputs.RELEASE_VERSION }}
+    secrets: inherit
 
   generate-wheel-index:
     name: 'Generate Pip Index'
diff --git a/.github/workflows/manual_dispatch.yml b/.github/workflows/manual_dispatch.yml
index 8c490883506b..af5fa67c1ef1 100644
--- a/.github/workflows/manual_dispatch.yml
+++ b/.github/workflows/manual_dispatch.yml
@@ -36,16 +36,10 @@ on:
         default: 'linux'
 
       BUILD_WEB:
-        description: 'Run reusable_build_web'
-        type: boolean
-        required: false
-        default: true
-
-      BUILD_WEB_DEMO:
-        description: 'Run reusable_build_web'
-        type: boolean
+        description: 'Run reusable_build_web/reusable_build_web_demo (Full build: app,demo)'
+        type: string
         required: false
-        default: true
+        default: 'app,demo'
 
       RELEASE_VERSION:
         description: 'Release Version Number (Must match Cargo.toml)'
@@ -218,7 +212,7 @@ jobs:
 
   build-web:
     name: 'Build Web'
-    if: ${{ github.event.inputs.BUILD_WEB == 'true'}}
+    if: ${{ contains(github.event.inputs.BUILD_WEB, 'app') }}
     uses: ./.github/workflows/reusable_build_web.yml
     with:
       CONCURRENCY: manual-dispatch-${{ github.run_id}}
@@ -228,7 +222,7 @@ jobs:
   upload-web:
     name: 'Upload Web'
     needs: [min-test-wheel, build-web]
-    if: ${{ (github.event.inputs.BUILD_WEB == 'true') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }}
+    if: ${{ contains(github.event.inputs.BUILD_WEB, 'app') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }}
     uses: ./.github/workflows/reusable_upload_web.yml
     with:
       CONCURRENCY: manual-dispatch-${{ github.run_id}}
@@ -240,7 +234,7 @@ jobs:
   build-web-demo:
     name: 'Build Web Demo'
     needs: [min-test-wheel, build-web]
-    if: ${{ github.event.inputs.BUILD_WEB_DEMO == 'true'}}
+    if: ${{ contains(github.event.inputs.BUILD_WEB, 'demo') }}
     uses: ./.github/workflows/reusable_build_web_demo.yml
     with:
       CONCURRENCY: manual-dispatch-${{ github.run_id}}
@@ -250,7 +244,7 @@ jobs:
   upload-web-demo:
     name: 'Upload Web Demo'
     needs: [build-web-demo]
-    if: ${{ (github.event.inputs.BUILD_WEB_DEMO == 'true') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }}
+    if: ${{ contains(github.event.inputs.BUILD_WEB, 'demo') && (github.event.inputs.UPLOAD_GCLOUD == 'true') }}
     uses: ./.github/workflows/reusable_upload_web_demo.yml
     with:
       CONCURRENCY: manual-dispatch-${{ github.run_id}}
diff --git a/.github/workflows/manual_release.yml b/.github/workflows/manual_release.yml
index 7d34ebe2ade5..c5d6926cf09e 100644
--- a/.github/workflows/manual_release.yml
+++ b/.github/workflows/manual_release.yml
@@ -91,4 +91,8 @@ jobs:
           generateReleaseNotes: true
           allowUpdates: true
           draft: true
+      
+      - name: Release Web Demo
+        run: |
+          gsutil -m cp -r "gs://rerun-demo/commit/${{ env.SHORT_SHA }}/*" "gs://rerun-demo/version/latest/"
 
diff --git a/.github/workflows/on_push_main.yml b/.github/workflows/on_push_main.yml
index ceb0ad653287..e69f410b5c91 100644
--- a/.github/workflows/on_push_main.yml
+++ b/.github/workflows/on_push_main.yml
@@ -60,7 +60,7 @@ jobs:
     secrets: inherit
 
   upload-web-demo:
-    name: 'Upload Web'
+    name: 'Upload Web Demo'
     needs: [build-web-demo]
     uses: ./.github/workflows/reusable_upload_web_demo.yml
     with:
diff --git a/.github/workflows/reusable_upload_web.yml b/.github/workflows/reusable_upload_web.yml
index 41bcd4896d11..86122112f617 100644
--- a/.github/workflows/reusable_upload_web.yml
+++ b/.github/workflows/reusable_upload_web.yml
@@ -32,6 +32,10 @@ on:
         required: false
         type: string
         default: ''
+      UPLOAD_COMMIT:
+        required: false
+        type: boolean
+        default: true
 
 concurrency:
   group: ${{ inputs.CONCURRENCY }}-upload-web
@@ -80,6 +84,7 @@ jobs:
           echo "SHORT_SHA=$(echo $USED_SHA | cut -c1-7)" >> $GITHUB_ENV
 
       - name: "Upload web-viewer (commit)"
+        if: ${{ inputs.UPLOAD_COMMIT }}
         uses: google-github-actions/upload-cloud-storage@v1
         with:
           path: "web_viewer"
@@ -87,6 +92,7 @@ jobs:
           parent: false
 
       - name: "Upload RRD (commit)"
+        if: ${{ inputs.UPLOAD_COMMIT }}
         uses: google-github-actions/upload-cloud-storage@v1
         with:
           path: "rrd"
diff --git a/.github/workflows/reusable_upload_web_demo.yml b/.github/workflows/reusable_upload_web_demo.yml
index 37975702317e..57b5eec72b56 100644
--- a/.github/workflows/reusable_upload_web_demo.yml
+++ b/.github/workflows/reusable_upload_web_demo.yml
@@ -28,6 +28,10 @@ on:
         required: false
         type: string
         default: ''
+      UPLOAD_COMMIT:
+        required: false
+        type: boolean
+        default: true
 
 concurrency:
   group: ${{ inputs.CONCURRENCY }}-upload-web-demo
@@ -69,6 +73,7 @@ jobs:
           echo "SHORT_SHA=$(echo $USED_SHA | cut -c1-7)" >> $GITHUB_ENV
 
       - name: "Upload web demo (commit)"
+        if: ${{ inputs.UPLOAD_COMMIT }}
         uses: google-github-actions/upload-cloud-storage@v1
         with:
           path: "web_demo"
@@ -90,14 +95,6 @@ jobs:
           path: "web_demo"
           destination: "rerun-demo/version/${{inputs.RELEASE_VERSION}}"
           parent: false
-      
-      - name: "Upload web demo (latest)"
-        if: inputs.MARK_TAGGED_VERSION
-        uses: google-github-actions/upload-cloud-storage@v1
-        with:
-          path: "web_demo"
-          destination: "rerun-demo/version/latest"
-          parent: false
 
       - name: "Upload web demo (adhoc)"
         if: ${{ inputs.ADHOC_NAME != '' }}