diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f78f95a..21ac321 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -270,41 +270,60 @@ jobs:
           make && make clean
 
   nvhpc:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-${{ matrix.distro != '' && matrix.distro || 'latest' }}
     strategy:
-        matrix:
-          version:
+      matrix:
+        include:
           # For available versions, see
           # https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64/Packages
-          #
-          # Note that version prior to 21.11 don't support passing
-          # arguments to the __malloc__ atctribute, which glibc >= 2.34,
-          # which is used in CI, does unconditionally. That causes
-          # breaks several of the tests for versions prior to 21.11.
-          # - "20.11"
-          # - "21.1" ## BROKEN. File size mismatch.
-          # - "21.2"
-          # - "21.3"
-          # - "21.5"
-          # - "21.7"
-          # - "21.9"
-          - "21.11"
-          # - "22.1"
-          # - "22.2"
-          # - "22.3"
-          # - "22.5"
-          # - "22.7"
-          # - "22.9"
-          - "22.11"
-          # - "23.1"
-          # - "23.3"
-          # - "23.5"
-          # - "23.7"
-          # - "23.9"
-          - "23.11"
-          # - "24.1"
-          # - "24.3"
-          # - "24.7"
+        - version: "20.11"
+          distro: "20.04"
+        # - version: "21.1" ## BROKEN. File size mismatch.
+        #   distro: "20.04"
+        # - version: "21.2"
+        #   distro: "20.04"
+        # - version: "21.3"
+        #   distro: "20.04"
+        # - version: "21.5"
+        #   distro: "20.04"
+        - version: "21.7"
+          distro: "20.04"
+        # - version: "21.9"
+        #   distro: "20.04"
+        # - version: "21.11"
+        #   distro: "22.04"
+        # - version: "22.1"
+        #   distro: "22.04"
+        # - version: "22.2"
+        #   distro: "22.04"
+        - version: "22.3"
+          distro: "22.04"
+        # - version: "22.5"
+        #   distro: "22.04"
+        # - version: "22.7"
+        #   distro: "22.04"
+        # - version: "22.9"
+        #   distro: "22.04"
+        # - version: "22.11"
+        #   distro: "22.04"
+        - version: "23.1"
+          distro: "22.04"
+        # - version: "23.3"
+        #   distro: "22.04"
+        # - version: "23.5"
+        #   distro: "22.04"
+        # - version: "23.7"
+        #   distro: "22.04"
+        # - version: "23.9"
+        #   distro: "22.04"
+        - version: "23.11"
+          distro: "22.04"
+        # - version: "24.1"
+        #   distro: "22.04"
+        # - version: "24.3"
+        #   distro: "22.04"
+        - version: "24.7"
+          distro: "24.04"
     steps:
       - uses: actions/checkout@v4
       - name: Free some disk space