diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 4b6a6932aa7..5b98280155c 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -67,43 +67,3 @@ jobs:
           poetry run bash scripts/benchmarks.sh ./reflex-web prod
         env:
           LHCI_GITHUB_APP_TOKEN: $
-
-
-  reflex-benchmarks:
-    timeout-minutes: 30
-    strategy:
-      # Prioritize getting more information out of the workflow (even if something fails)
-      fail-fast: false
-      matrix:
-        # Show OS combos first in GUI
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        python-version: [ '3.8.18', '3.9.18', '3.10.13', '3.11.5', '3.12.0' ]
-        exclude:
-          - os: windows-latest
-            python-version: '3.10.13'
-          - os: windows-latest
-            python-version: '3.9.18'
-          - os: windows-latest
-            python-version: '3.8.18'
-        include:
-          - os: windows-latest
-            python-version: '3.10.11'
-          - os: windows-latest
-            python-version: '3.9.13'
-          - os: windows-latest
-            python-version: '3.8.10'
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup_build_env
-        with:
-          python-version: ${{ matrix.python-version }}
-          run-poetry-install: true
-          create-venv-at-path: .venv
-      - run: poetry run pip install pytest-codspeed pyvirtualdisplay pillow
-      - name: Run Benchmarks
-        # Only run if the database creds are available in this context.
-        uses: CodSpeedHQ/action@v2
-        with:
-          run: poetry run pytest integration/benchmarks/ --codspeed
diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml
new file mode 100644
index 00000000000..e08a52c24eb
--- /dev/null
+++ b/.github/workflows/codspeed.yml
@@ -0,0 +1,43 @@
+name: codspeed-benchmarks
+
+on:
+  push:
+    branches: [main]
+    paths-ignore:
+      - '**/*.md'
+  pull_request:
+    branches: [main]
+    paths-ignore:
+      - '**/*.md'
+
+permissions:
+  contents: read
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  benchmarks:
+    strategy:
+      # Prioritize getting more information out of the workflow (even if something fails)
+      fail-fast: false
+      matrix:
+        # Show OS combos first in GUI
+        os: [ ubuntu-latest ]
+        python-version: [ '3.8.18', '3.9.18', '3.10.13', '3.11.5', '3.12.0' ]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+          run-poetry-install: true
+          create-venv-at-path: .venv
+
+      - run: poetry run pip install pytest-codspeed pyvirtualdisplay pillow
+      - name: Run benchmarks
+        uses: CodSpeedHQ/action@v2
+        with:
+          run: poetry run pytest tests/ --codspeed