diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ab36e0..9a6e40b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-22.04"] # "windows-2022" # Disabled until solution/workaround for NVTX is present
+        os:
+          ["ubuntu-22.04"] # "windows-2025" # Disabled until solution/workaround for NVTX is present
+          # "ubuntu-24.04" # Postponed as long as testing against CUDA 12.1, needs 12.6+
         python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     name: "${{ matrix.os }} / Python ${{ matrix.python }}"
@@ -79,7 +81,7 @@ jobs:
       - build
 
     name: "Check Build"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: re-actors/alls-green@release/v1
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 80668cd..8a9cc83 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -19,7 +19,7 @@ concurrency:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04 # "ubuntu-24.04" # Postponed as long as testing against CUDA 12.1, needs 12.6+
 
     steps:
       - uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
 
   publish:
     name: Upload release to GitHub Pages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.event_name == 'release' && github.event.action == 'published'
 
     needs:
@@ -96,7 +96,7 @@ jobs:
       - publish
 
     name: "Check Docs"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: re-actors/alls-green@release/v1
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 46e5076..c67d49f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
         python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     name: "Python ${{ matrix.python }}"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
@@ -44,7 +44,7 @@ jobs:
       - lint
 
     name: "Check Lint"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: re-actors/alls-green@release/v1
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 7a7cf67..a6ec7c4 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -19,7 +19,7 @@ concurrency:
 jobs:
   dist:
     name: Distribution build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
@@ -28,7 +28,7 @@ jobs:
 
   publish-test:
     name: Upload release to TestPyPI
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.event_name == 'release' && github.event.action == 'published'
 
     needs:
@@ -53,7 +53,7 @@ jobs:
 
   publish:
     name: Upload release to PyPI
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.event_name == 'release' && github.event.action == 'published'
 
     needs:
@@ -83,7 +83,7 @@ jobs:
       - publish
 
     name: "Check PyPI"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: re-actors/alls-green@release/v1
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 4005903..a3772ce 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -14,7 +14,7 @@ jobs:
       contents: write
       pull-requests: read
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: release-drafter/release-drafter@v6