diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f700c87d..507fd806f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -174,7 +174,10 @@ jobs:
           - script: linux-checks/sanitizers
             image: rocstreaming/env-ubuntu
 
-          - script: linux-checks/valgrind
+          - script: linux-checks/valgrind-debug
+            image: rocstreaming/env-ubuntu
+
+          - script: linux-checks/valgrind-release
             image: rocstreaming/env-ubuntu
 
           - script: linux-checks/check-formatting
diff --git a/scripts/ci_checks/linux-checks/run-tests-in-valgrind.sh b/scripts/ci_checks/linux-checks/run-tests-in-valgrind.sh
new file mode 100755
index 000000000..295d07f57
--- /dev/null
+++ b/scripts/ci_checks/linux-checks/run-tests-in-valgrind.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -eux -o pipefail
+
+find bin/x86_64-pc-linux-gnu -name 'roc-test-*' |\
+    while read tst
+    do
+        python3 scripts/scons_helpers/timeout-run.py 3000 \
+            valgrind \
+                --max-stackframe=10475520 \
+                --error-exitcode=1 --exit-on-first-error=yes \
+                ${tst}
+    done
diff --git a/scripts/ci_checks/linux-checks/valgrind-debug.sh b/scripts/ci_checks/linux-checks/valgrind-debug.sh
new file mode 100755
index 000000000..6420cf424
--- /dev/null
+++ b/scripts/ci_checks/linux-checks/valgrind-debug.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+scons -Q \
+      --enable-debug \
+      --enable-werror \
+      --enable-tests \
+      --enable-examples \
+      --compiler=gcc \
+      --build-3rdparty=all
+
+"$( dirname "$0" )"/run-tests-in-valgrind.sh
diff --git a/scripts/ci_checks/linux-checks/valgrind-release.sh b/scripts/ci_checks/linux-checks/valgrind-release.sh
new file mode 100755
index 000000000..442b5dd99
--- /dev/null
+++ b/scripts/ci_checks/linux-checks/valgrind-release.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+scons -Q \
+      --enable-werror \
+      --enable-tests \
+      --enable-examples \
+      --compiler=gcc \
+      --build-3rdparty=all
+
+"$( dirname "$0" )"/run-tests-in-valgrind.sh
diff --git a/scripts/ci_checks/linux-checks/valgrind.sh b/scripts/ci_checks/linux-checks/valgrind.sh
deleted file mode 100755
index 39c4e86ea..000000000
--- a/scripts/ci_checks/linux-checks/valgrind.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-# debug
-scons -Q \
-      --enable-werror \
-      --enable-debug \
-      --enable-tests \
-      --enable-examples \
-      --compiler=clang \
-      --build-3rdparty=all \
-      test
-
-find bin/x86_64-pc-linux-gnu -name 'roc-test-*' |\
-    while read tst
-    do
-        python3 scripts/scons_helpers/timeout-run.py 3000 \
-            valgrind \
-                --max-stackframe=10475520 \
-                --error-exitcode=1 --exit-on-first-error=yes \
-                ${tst}
-    done
-
-# release
-scons -Q \
-      --enable-werror \
-      --enable-tests \
-      --enable-examples \
-      --compiler=clang \
-      --build-3rdparty=all \
-      test
-
-find bin/x86_64-pc-linux-gnu -name 'roc-test-*' |\
-    while read tst
-    do
-        python3 scripts/scons_helpers/timeout-run.py 3000 \
-            valgrind \
-                --max-stackframe=10475520 \
-                --error-exitcode=1 --exit-on-first-error=yes \
-                ${tst}
-    done