diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml
index aac7b7229..81e8e424e 100644
--- a/.github/workflows/build-pull-request.yaml
+++ b/.github/workflows/build-pull-request.yaml
@@ -39,13 +39,26 @@ jobs:
 
     strategy:
       matrix:
-        target: [release, develop]
+        target: [develop]
+        os: [ubuntu22.04, ubuntu24.04]
+        cuda_version: [12.5.1, 13.0.2]
+        optix_version: [7.7.0]
+        geant4_version: [11.3.2]
+        cmake_version: [3.22.1]
+
+        include:
+          - target: release
+            os: ubuntu24.04
+            cuda_version: 13.0.2
+            optix_version: 8.1.0
+            geant4_version: 11.3.2
+            cmake_version: 4.2.1
 
     steps:
       - name: Define environment variables
         run: |
           echo IMAGE_NAME=ghcr.io/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
-          echo IMAGE_TAG=$(echo "PR-${{ github.event.pull_request.number }}-${{ matrix.target }}") >> $GITHUB_ENV
+          echo IMAGE_TAG=$(echo "PR-${{ github.event.pull_request.number }}-${{ matrix.cuda_version }}-${{ matrix.target }}-${{ matrix.os }}") >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -59,6 +72,12 @@ jobs:
           context: .
           tags: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
           target: ${{ matrix.target }}
+          build-args: |
+            OS=${{ matrix.os }}
+            CUDA_VERSION=${{ matrix.cuda_version }}
+            OPTIX_VERSION=${{ matrix.optix_version }}
+            GEANT4_VERSION=${{ matrix.geant4_version }}
+            CMAKE_VERSION=${{ matrix.cmake_version }}
           load: true
           cache-from: type=local,src=/home/runner/.buildx-cache
           cache-to: type=local,dest=/home/runner/.buildx-cache-new,mode=max