diff --git a/codebuild/spec/buildspec_valgrind.yml b/codebuild/spec/buildspec_valgrind.yml
index 1b95fe9c3d0..e89363086aa 100644
--- a/codebuild/spec/buildspec_valgrind.yml
+++ b/codebuild/spec/buildspec_valgrind.yml
@@ -15,30 +15,6 @@ version: 0.2
 
 batch:
   build-list:
-    - identifier: clang_awslc
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          S2N_LIBCRYPTO: awslc
-          COMPILER: clang
-    - identifier: clang_openssl_3_0
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          S2N_LIBCRYPTO: openssl-3.0
-          COMPILER: clang
-    - identifier: clang_openssl_1_1_1
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          S2N_LIBCRYPTO: openssl-1.1.1
-          COMPILER: clang
-    - identifier: clang_openssl_1_0_2
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          S2N_LIBCRYPTO: openssl-1.0.2
-          COMPILER: clang
     - identifier: gcc_awslc
       env:
         compute-type: BUILD_GENERAL1_LARGE
@@ -73,6 +49,5 @@ phases:
     on-failure: ABORT
     commands:
       - |
-        S2N_DEBUG=true S2N_VALGRIND=1 \
-          CTEST_PARALLEL_LEVEL=$(nproc) CTEST_OUTPUT_ON_FAILURE=1 ctest -T memcheck \
+        S2N_VALGRIND=1 CTEST_PARALLEL_LEVEL=$(nproc) CTEST_OUTPUT_ON_FAILURE=1 ctest -T memcheck \
           --test-dir build ARGS="-output-on-failure"
diff --git a/tests/unit/valgrind.suppressions b/tests/unit/valgrind.suppressions
index 95581c2e589..896484d96a2 100644
--- a/tests/unit/valgrind.suppressions
+++ b/tests/unit/valgrind.suppressions
@@ -1,6 +1,18 @@
 # It looks like valgrind may generate false positives on pthreads: https://stackoverflow.com/a/13132968
 {
-   pthread_false_positive
+   pthred_false_positive
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:calloc
+   fun:allocate_dtv
+   fun:_dl_allocate_tls
+   fun:allocate_stack
+   fun:pthread_create@@GLIBC_2.2.5
+   fun:main
+}
+# Append valgrind suppression for ubuntu22
+{
+   pthread_false_positive_ubuntu22
    Memcheck:Leak
    match-leak-kinds: possible
    fun:calloc
@@ -33,6 +45,7 @@
    fun:dlerror_run
    fun:__libc_dlopen_mode
    fun:__libc_unwind_link_get
+   fun:__libc_unwind_link_get
    fun:backtrace
    ...
    fun:main