diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 388157fbab..cb6d2117d9 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -68,41 +68,10 @@ jobs:
             exit 1
           fi
 
-  add-runner:
-    needs: prepare
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix: ${{ fromJson(needs.prepare.outputs.benchmarks_to_execute) }}
-    steps:
-      - name: Generate a token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-          role-session-name: Github_Add_Runner
-          aws-region: eu-central-1
-      - name: Login to Amazon ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v2
-      - name: Execute Lambda function
-        run: |
-          aws lambda invoke --function-name jit_runner_register_and_create_runner_container  --cli-binary-format raw-in-base64-out --payload '{"github_api_secret": "${{ steps.generate-token.outputs.token }}", "count_container":  1, "container_compute": "M", "repository": "${{ github.repository }}" }'  response.json
-
-          if ! grep -q '"statusCode": 200' response.json; then
-            echo "Lambda function failed. statusCode is not 200."
-            exit 1
-          fi
-
   benchmark-test:
     name: run
-    needs: [prepare, add-runner]
-    runs-on: self-hosted
+    needs: [prepare]
+    runs-on: M
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.prepare.outputs.benchmarks_to_execute) }}
@@ -111,14 +80,32 @@ jobs:
       BAYBE_BENCHMARKING_PERSISTENCE_PATH: ${{ secrets.TEST_RESULT_S3_BUCKET }}
       BAYBE_PARALLEL_SIMULATION_RUNS: false
     steps:
+      - name: System Information
+        run: |
+          echo -e "\033[1;34m===== SYSTEM INFORMATION =====\033[0m"
+          uname -a
+          echo -e "\n\n\n\033[1;34m===== CPU INFORMATION =====\033[0m"
+          lscpu
+          echo -e "\n\n\n\033[1;34m===== BLOCK DEVICES =====\033[0m"
+          lsblk
+          echo -e "\n\n\n\033[1;34m===== MEMORY INFORMATION =====\033[0m"
+          free -h
+          echo -e "\n\n\n\033[1;34m===== DISK USAGE =====\033[0m"
+          df -h
+          if [ -x "$(command -v nvidia-smi)" ]; then
+            echo -e "\n\n\n\033[1;34m===== GPU INFORMATION =====\033[0m"
+            nvidia-smi
+          fi
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
-        id: setup-python
+      - name: "Set up Python"
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Install the project
+        run: uv sync --locked --extra benchmarking
       - name: Benchmark
-        run: |
-          pip install '.[benchmarking]'
-          python -W ignore -m benchmarks --benchmark-list "${{ matrix.benchmark_list }}"
+        run: uv run -m benchmarks --benchmark-list "${{ matrix.benchmark_list }}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1cb680e1cd..91d840fcea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -175,3 +175,26 @@ jobs:
           tr -d '%' |
           sed '$d' |
           awk '{if ( $1<${{ env.COVERAGE_INDIVIDUAL_THRESH }} ) exit 1 }'
+
+  gputest:
+    needs: [typecheck]
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    strategy:
+      matrix:
+        py-version: [ {semantic: '3.10', tox: 'py310'} ]
+    name: GPU Tests ${{ matrix.py-version.semantic }}
+    runs-on: XS-GPU
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: ${{ matrix.py-version.semantic }}
+      - uses: actions/cache@v4
+        with:
+          path: .tox/gputest-${{ matrix.py-version.tox }}
+          key: gputest-${{ matrix.py-version.tox }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('tox.ini') }}
+      - name: Run GPU tests
+        run: |
+          pip install tox-uv
+          tox -e gputest-${{ matrix.py-version.tox }}
\ No newline at end of file
diff --git a/.github/workflows/regular.yml b/.github/workflows/regular.yml
index 3a62cd6b6f..e656336ff3 100644
--- a/.github/workflows/regular.yml
+++ b/.github/workflows/regular.yml
@@ -161,3 +161,26 @@ jobs:
           tr -d '%' |
           sed '$d' |
           awk '{if ( $1<${{ env.COVERAGE_INDIVIDUAL_THRESH }} ) exit 1 }'
+      
+  gputest:
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [typecheck, audit]
+    strategy:
+      fail-fast: false
+      matrix:
+        py-version: [ {semantic: '3.10', tox: 'py310'},
+                      {semantic: '3.11', tox: 'py311'},
+                      {semantic: '3.12', tox: 'py312'},
+                      {semantic: '3.13', tox: 'py313'} ]
+    name: GPU Tests ${{ matrix.py-version.semantic }}
+    runs-on: XS-GPU
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: ${{ matrix.py-version.semantic }}
+      - name: Run GPU tests
+        run: |
+          pip install tox-uv
+          tox -e gputest-${{ matrix.py-version.tox }}
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 173040fc2a..54cb5ba91c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 min_version = 4.9
-env_list = {fulltest,coretest,lint,mypy,audit}-py{310,311,312,313}
+env_list = {fulltest,gputest,coretest,lint,mypy,audit}-py{310,311,312,313}
 isolated_build = True
 
 [testenv:fulltest,fulltest-py{310,311,312,313}]
@@ -18,6 +18,20 @@ commands =
     python --version
     pytest -p no:warnings --cov=baybe --durations=5 {posargs}
 
+[testenv:gputest,gputest-py{310,311,312,313}]
+description = Runs GPU tests
+extras = test
+passenv =
+    CI
+    BAYBE_NUMPY_USE_SINGLE_PRECISION
+    BAYBE_TORCH_USE_SINGLE_PRECISION
+    BAYBE_PARALLEL_SIMULATION_RUNS
+setenv =
+    BAYBE_TEST_ENV = GPUTEST
+commands =
+    python --version
+    python -c "import torch; assert torch.cuda.is_available()"
+
 [testenv:coretest,coretest-py{310,311,312,313}]
 description = Run PyTest with core functionality
 extras = test