diff --git a/.github/actions/Build_and_Test_CppInterOp/action.yml b/.github/actions/Build_and_Test_CppInterOp/action.yml
index ba3372825..873a6a5f9 100644
--- a/.github/actions/Build_and_Test_CppInterOp/action.yml
+++ b/.github/actions/Build_and_Test_CppInterOp/action.yml
@@ -58,7 +58,7 @@ runs:
         else
           cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
           os="${{ matrix.os }}"
-          if [[ "${os}" != "macos"* ]]; then
+          if [[ "${os}" != "macos"* && "${{ matrix.Valgrind }}" == "On" ]]; then
             CLANG_VERSION="${{ matrix.clang-runtime }}"
             if [[ "$CLANG_VERSION" == "20" && "${{ matrix.cling }}" == "Off" ]]; then
               SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
diff --git a/.github/actions/Build_and_Test_cppyy/action.yml b/.github/actions/Build_and_Test_cppyy/action.yml
index 5cb73f36f..b4c890cfd 100644
--- a/.github/actions/Build_and_Test_cppyy/action.yml
+++ b/.github/actions/Build_and_Test_cppyy/action.yml
@@ -106,7 +106,7 @@ runs:
 
         set -o pipefail
         os="${{ matrix.os }}"
-        if [[ "${os}" != "macos"* ]]; then
+        if [[ "${os}" != "macos"* && "${{ matrix.Valgrind }}" == "On" ]]; then
           echo "Running valgrind on passing tests"
           CLANG_VERSION="${{ matrix.clang-runtime }}"
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c308ca55..9db2b1d90 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,6 +31,7 @@ jobs:
             cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
+            Valgrind: On
           - name: ubu24-arm-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04-arm
             compiler: gcc-12
@@ -67,6 +68,7 @@ jobs:
             llvm_targets_to_build: "host;NVPTX"
             coverage: true
             oop-jit: On
+            Valgrind: On
           - name: ubu24-x86-gcc12-clang-repl-20
             os: ubuntu-24.04
             compiler: gcc-12
@@ -311,3 +313,4 @@ jobs:
       uses: mxschmitt/action-tmate@v3
       # When debugging increase to a suitable value!
       timeout-minutes: 30
+