diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml
index 000b5419d..a5d70eb92 100644
--- a/.github/workflows/run_pr_tests.yml
+++ b/.github/workflows/run_pr_tests.yml
@@ -332,7 +332,7 @@ jobs:
         hal_refsi_thread_mode: WG
         debug_support: ON
 
-  # Based on: mr-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release:
+  # Based on: mr-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release
   run-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release:
     runs-on: ubuntu-22.04
     timeout-minutes: 60
@@ -356,7 +356,7 @@ jobs:
         enable_api: ""
         builtin_kernel: ON
 
-  # Based on: mr-ubuntu-gcc-aarch64-llvm-previous-cl3-0-fp16:
+  # Based on: mr-ubuntu-gcc-aarch64-llvm-previous-cl3-0-fp16
   run-ubuntu-gcc-aarch64-llvm-latest-cl3-0-fp16:
     runs-on: ubuntu-22.04
     timeout-minutes: 90 # aarch64 needs longer timeout
@@ -390,3 +390,68 @@ jobs:
         toolchain_file: "scripts/../platform/arm-linux/aarch64-toolchain.cmake"
         extra_flags: -DCA_BUILTINS_TOOLS_DIR=${{ github.workspace }}/llvm_install_native/bin
 
+  # Based on a combination of: mr-ubuntu-gcc-x86_64-clik
+  #                       and: mr-ubuntu-gcc-x86_64-clik-refsi
+  run-ubuntu-gcc-x86_64-clik-refsi:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 60
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4.1.0
+    - name: Install Ninja
+      uses: llvm/actions/install-ninja@main
+    - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al
+    - name: Run Clik
+      run: |
+        cmake -Bbuild_clik -GNinja -DCMAKE_INSTALL_PREFIX=install clik
+        LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik check
+    - name: Run Clik-Refsi # No initial clean - just point o/p at new dirs
+      run: |
+        cmake -Bbuild_clik_refsi -GNinja -DCMAKE_INSTALL_PREFIX=install_refsi -DCLIK_HAL_NAME=refsi -DHAL_REFSI_SOC=M1 -DCLIK_EXTERNAL_HAL_DIR=${{ github.workspace }}/examples/refsi/hal_refsi clik
+        LD_PRELOAD=/lib/x86_64-linux-gnu/libpthread.so.0 ninja -Cbuild_clik_refsi check
+
+  # Based on: mr-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0
+  run-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0:
+    if: ${{ !inputs.is_pull_request }}  # do not run as PR job for now to avoid flooding the concurrency
+    runs-on: ubuntu-22.04
+    timeout-minutes: 60
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4.1.0
+    - name: setup-ubuntu
+      uses: ./.github/actions/setup_build
+      with:
+        llvm_version: '19'
+        llvm_build_type: RelAssert
+        save:  ${{ inputs.update_cache }}
+    - run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al
+    - name: build ock
+      uses: ./.github/actions/do_build_ock
+      with:
+        build_targets: install # Build the install target so we don't miss compilation errors
+        mux_targets_enable: riscv
+        external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi
+        mux_compilers_enable: refsi_g1_wi
+        riscv_enabled: ON
+        disable_unitcl_vecz_checks: ON
+        enable_rvv_scalable_vecz_check: ON
+        enable_rvv_scalable_vp_vecz_check: ON
+        use_linker: gold
+        hal_description: RV64GCV
+        hal_refsi_soc: G1
+        hal_refsi_thread_mode: WI
+        debug_support: ON
+    # For now DO NOT include run_cities.py testing. Run commands generated by the import tool are:
+    #- run: python -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release
+    #- run: echo 'Subgroups,subgroups/test_subgroups barrier_functions_core' >> skipped.txt
+    #- run: python scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml
+    - run: ninja -C build check-ock
+    - run: ninja -C build check-ock-UnitCL-half
+    # For now DO NOT include upload of run_cities.py testing logs. Action commands generated by the import tool are:
+    #- uses: actions/upload-artifact@v4.1.0
+    #  if: success()
+    #  with:
+    #    name: ${{ github.job }}
+    #    path: |
+    #      oneapi-construction-kit/build/*.fail
+    #      oneapi-construction-kit/build/*.log