diff --git a/.github/workflows/corevalidation-report.yml b/.github/workflows/corevalidation-report.yml
index e1577d307..e4f611252 100644
--- a/.github/workflows/corevalidation-report.yml
+++ b/.github/workflows/corevalidation-report.yml
@@ -2,7 +2,7 @@ name: Publish CoreValidation Results
 
 on:
   workflow_run:
-    workflows: ["corevalidation"]
+    workflows: ["CoreValidation"]
     # avoid running once merged on main branch, this should be run only on PRs
     branches-ignore: ["main"]
     types:
diff --git a/.github/workflows/corevalidation.yml b/.github/workflows/corevalidation.yml
index d8f763291..8bd72d631 100644
--- a/.github/workflows/corevalidation.yml
+++ b/.github/workflows/corevalidation.yml
@@ -1,4 +1,4 @@
-name: Build CoreValidation tests
+name: CoreValidation
 on:
   workflow_dispatch:
   pull_request:
@@ -11,8 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  corevalidation:
-    name: Build
+  build-and-run:
     runs-on: ubuntu-latest
     steps:
       - run: |
@@ -100,9 +99,11 @@ jobs:
           
           # Fix library search for VHT
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(dirname $(which VHT_MPS2_Cortex-M3))
+          chmod +x $(dirname $(which VHT_MPS2_Cortex-M3))/VHT_*
 
           echo "Activate Arm tool license"
-          ${AC6_TOOLCHAIN_6_20_0}/armlm activate --server https://mdk-preview.keil.arm.com --product KEMDK-COM0
+          whoami
+          ${AC6_TOOLCHAIN_6_20_0}/armlm activate --code ${{ secrets.ARM_UBL_ACTIVATION_CODE }}
 
           echo "Patch CMSIS-Toolbox"
           pushd $(dirname $(which cbuild))/../etc
@@ -115,16 +116,22 @@ jobs:
           echo "Register local CMSIS-DFP pack"
           cpackget add /home/runner/CMSIS-DFP/ARM.CMSIS_DFP.pdsc
 
-          echo "Run build script"
-          # ./build.py --verbose -m VHT -c AC6 -c GCC -c Clang build || echo "=== Something failed! ==="
+          echo "Build test projects ..."
+          ./build.py --verbose -m VHT -c AC6 -c GCC -c Clang build || echo "=== Something failed! ==="
 
-          echo "Run build script"
-          ./build.py --verbose -m VHT -c AC6 -d CM3 -o none build run || echo "=== Something failed! ==="
+          echo "Run test projects ..."
+          ./build.py --verbose -m VHT -c AC6 -c GCC -c Clang -d "CM[047]*" -d "CM3" -d "CM[23]3*" run || echo "=== Something failed! ==="
 
           echo "Deactivate Arm tool license"
-          ${AC6_TOOLCHAIN_6_20_0}/armlm deactivate --product KEMDK-COM0
+          ${AC6_TOOLCHAIN_6_20_0}/armlm deactivate --product HWSKT-EAC0
 
       - name: Perform CodeQL Analysis
-        if: always()
+        if: ${{ !cancelled() }}
         uses: github/codeql-action/analyze@v2
-    
\ No newline at end of file
+
+      - name: Archive Test Reports
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results
+          path: build/*.junit
diff --git a/CMSIS/CoreValidation/Project/build.py b/CMSIS/CoreValidation/Project/build.py
index 6ac892f27..4deaf06dc 100755
--- a/CMSIS/CoreValidation/Project/build.py
+++ b/CMSIS/CoreValidation/Project/build.py
@@ -164,11 +164,11 @@ def bl_output_dir(config):
 
 
 def model_config(config):
-    return f"../layer/target/{config.device[1]}/model_config.txt"
+    return f"../Layer/Target/{config.device[1]}/model_config.txt"
 
 
 def build_dir(config):
-    return f"build/{config.device[1]}/{config.compiler}/{config.optimize}"
+    return f"build/{config.device[1]}/{config.compiler.toolchain}/{config.optimize}"
 
 
 @matrix_action