diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml
new file mode 100644
index 00000000000..52fd35d8d51
--- /dev/null
+++ b/.github/workflows/codspeed.yml
@@ -0,0 +1,32 @@
+name: CodSpeed
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+  workflow_dispatch:
+
+env:
+  UV_SYSTEM_PYTHON: 1
+
+jobs:
+  benchmarks:
+    name: Run benchmarks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+      - run: |
+          uv pip install ".[dev, everest]"
+          uv pip uninstall pytest-benchmark
+          uv pip install pytest-codspeed
+      - uses: CodSpeedHQ/action@v3
+        with:
+          token: ${{ secrets.CODSPEED_TOKEN }}
+          run: |
+            pytest tests/ert/performance_tests --codspeed
diff --git a/pyproject.toml b/pyproject.toml
index e353f4ceb9c..5530c3eee70 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -173,7 +173,6 @@ markers = [
 log_cli = "false"
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"
-timeout = 360
 
 [tool.setuptools_scm]
 write_to = "src/ert/shared/version.py"