diff --git a/.github/workflows/chromatic-rc.yml b/.github/workflows/chromatic-rc.yml
deleted file mode 100644
index ea94d5c8f8e..00000000000
--- a/.github/workflows/chromatic-rc.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "Chromatic - RC"
-on:
-  push:
-    branches: [rc]
-  pull_request:
-    branches: [rc]
-    types: [labeled, synchronize]
-jobs:
-  run:
-    if: |
-      (github.event.action == 'labeled' && github.event.label.name == 'pr ready for visual snapshots') || github.event_name == 'push'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: package.json
-      - run: npm install
-      - run: npm --workspace="packages/calcite-design-tokens" run build
-      - name: Publish to Chromatic
-        uses: chromaui/action@v1
-        with:
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-          zip: true
-          exitOnceUploaded: true
-          autoAcceptChanges: rc
-          workingDir: packages/calcite-components
-        env:
-          STORYBOOK_SCREENSHOT_TEST_BUILD: true
-          CHROMATIC_DIFF_THRESHOLD: ${{ secrets.CHROMATIC_DIFF_THRESHOLD }}
-  skip:
-    if: contains(github.event.pull_request.labels.*.name, 'skip visual snapshots')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip Chromatic
-        uses: Sibz/github-status-action@v1
-        with:
-          authToken: ${{ secrets.GITHUB_TOKEN }}
-          context: UI Tests
-          description: Chromatic run skipped
-          state: success
-          sha: ${{github.event.pull_request.head.sha || github.sha}}
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index c03f5158cb9..faa8e133107 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -25,7 +25,7 @@ jobs:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           zip: true
           exitOnceUploaded: true
-          autoAcceptChanges: ${{ github.head_ref || github.ref_name }}
+          autoAcceptChanges: ${{ github.base_ref || github.ref_name }}
           workingDir: packages/calcite-components
         env:
           STORYBOOK_SCREENSHOT_TEST_BUILD: true
diff --git a/.github/workflows/pr-bot.yml b/.github/workflows/pr-bot.yml
index c6f4b87e224..c1fc87dd027 100644
--- a/.github/workflows/pr-bot.yml
+++ b/.github/workflows/pr-bot.yml
@@ -1,7 +1,7 @@
 name: PR Bot
 on:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 permissions:
   pull-requests: write
   issues: write
diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
index 0dc38364e70..cbe5e9c6c31 100644
--- a/.github/workflows/pr-e2e.yml
+++ b/.github/workflows/pr-e2e.yml
@@ -2,7 +2,7 @@ name: E2E
 on:
   workflow_dispatch:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 jobs:
   e2e:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/pr-milestone.yml b/.github/workflows/pr-milestone.yml
index 759dd7ea4c7..07d7167792a 100644
--- a/.github/workflows/pr-milestone.yml
+++ b/.github/workflows/pr-milestone.yml
@@ -1,7 +1,7 @@
 name: PR Merged
 on:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
     types: [closed]
 jobs:
   milestone:
diff --git a/.github/workflows/pr-tests_eslint-plugin-calcite-components.yml b/.github/workflows/pr-tests_eslint-plugin-calcite-components.yml
index 9ea510d7ba3..5eecf132457 100644
--- a/.github/workflows/pr-tests_eslint-plugin-calcite-components.yml
+++ b/.github/workflows/pr-tests_eslint-plugin-calcite-components.yml
@@ -3,10 +3,10 @@ name: Run eslint-plugin-calcite-components tests
 on:
   pull_request:
     paths: ["packages/eslint-plugin-calcite-components/**"]
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
   push:
     paths: ["packages/eslint-plugin-calcite-components/**"]
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 
 jobs:
   build: