diff --git a/.github/actions/do_build_dpcpp/action.yml b/.github/actions/do_build_dpcpp/action.yml
index dda81192e..2ed665aef 100644
--- a/.github/actions/do_build_dpcpp/action.yml
+++ b/.github/actions/do_build_dpcpp/action.yml
@@ -37,7 +37,7 @@ runs:
       if: inputs.create_dpcpp_artefact_method == 'build'
       shell: bash
       run:
-        cd llvm; python buildbot/configure.py
+        cd llvm; python3 buildbot/configure.py
         -o build
         --host-target="X86;AArch64;RISCV"
         --native_cpu
@@ -56,7 +56,7 @@ runs:
       if: inputs.create_dpcpp_artefact_method == 'build'
       shell: bash
       run:
-       python llvm/buildbot/compile.py -o llvm/build -v -j 8
+       python3 llvm/buildbot/compile.py -o llvm/build -v -j 8
 
     - name: build extra utilties
       if: inputs.create_dpcpp_artefact_method == 'build'
diff --git a/.github/actions/run_opencl_cts/action.yml b/.github/actions/run_opencl_cts/action.yml
index 50210bf47..6bfa50961 100644
--- a/.github/actions/run_opencl_cts/action.yml
+++ b/.github/actions/run_opencl_cts/action.yml
@@ -36,7 +36,7 @@ runs:
         fi
         set -x
         # Note: use 'eval' built-in to handle quoting/escaping/splitting reqs
-        RUN_CITIES="python -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \
+        RUN_CITIES="python3 -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \
           --color=always --timeout $CTS_TIMEOUT \
           $QEMU_SETTING \
           -b $GITHUB_WORKSPACE/test_conformance \
diff --git a/.github/actions/run_sycl_cts/action.yml b/.github/actions/run_sycl_cts/action.yml
index 0fe51698d..0291fe7c8 100644
--- a/.github/actions/run_sycl_cts/action.yml
+++ b/.github/actions/run_sycl_cts/action.yml
@@ -67,7 +67,7 @@ runs:
         export ONEAPI_DEVICE_SELECTOR=opencl:0
         export CTS_CSV_FILE=$GITHUB_WORKSPACE/.github/scripts/sycl-cts.csv
         set -x
-        python $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
+        python3 $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
           --color=always \
           --timeout $SYCL_CTS_TIMEOUT \
           $PREPEND_PATH \
diff --git a/.github/workflows/planned_testing.yml b/.github/workflows/planned_testing.yml
index 09abf8f42..4f8b99566 100644
--- a/.github/workflows/planned_testing.yml
+++ b/.github/workflows/planned_testing.yml
@@ -85,7 +85,7 @@ jobs:
     # build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
     runs-on: cp-ubuntu-24.04
     container:
-      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' }}
+      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest' }}
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
     if : inputs.ock && contains(inputs.target_list, 'linux')
diff --git a/.github/workflows/planned_testing_caller.yml b/.github/workflows/planned_testing_caller.yml
index 68d394f02..56bad6742 100644
--- a/.github/workflows/planned_testing_caller.yml
+++ b/.github/workflows/planned_testing_caller.yml
@@ -2,10 +2,10 @@
 name: Run planned testing
 on:
   # Note: use pull_request: for localized testing only
-  #pull_request:
-  #  paths:
-  #    - '.github/workflows/planned_testing.yml'
-  #    - '.github/workflows/planned_testing_caller.yml'
+  pull_request:
+   paths:
+     - '.github/workflows/planned_testing.yml'
+     - '.github/workflows/planned_testing_caller.yml'
   #  branches:
   #    - main
   schedule:
diff --git a/.github/workflows/run_pr_tests.yml b/.github/workflows/run_pr_tests.yml
index 00b3d4559..fe6a90fd3 100644
--- a/.github/workflows/run_pr_tests.yml
+++ b/.github/workflows/run_pr_tests.yml
@@ -457,9 +457,9 @@ jobs:
         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: python3 -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: python3 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: