diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
index 3a2e645..b4fe26c 100644
--- a/.github/workflows/lint-and-test.yaml
+++ b/.github/workflows/lint-and-test.yaml
@@ -38,9 +38,7 @@ jobs:
       matrix:
         setup:
           - rosdistro: jazzy
-            os: ubuntu-latest
-          - rosdistro: rolling
-            os: ubuntu-latest
+            os: ubuntu-24.04
     steps:
       - name: install build tools
         run: |