diff --git a/codebuild/spec/buildspec_fuzz_batch.yml b/codebuild/spec/buildspec_fuzz_batch.yml
index 1a6d4c7315d..ebfdf1a6b5f 100644
--- a/codebuild/spec/buildspec_fuzz_batch.yml
+++ b/codebuild/spec/buildspec_fuzz_batch.yml
@@ -39,6 +39,16 @@ batch:
         variables:
           S2N_LIBCRYPTO: awslc
           COMPILER: clang
+    - identifier: clang_awslc_fips_2022
+      buildspec: codebuild/spec/buildspec_fuzz.yml
+      debug-session: true
+      env:
+        compute-type: BUILD_GENERAL1_XLARGE
+        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu22codebuild
+        privileged-mode: true
+        variables:
+          S2N_LIBCRYPTO: awslc-fips-2022
+          COMPILER: clang
     - identifier: clang_openssl_1_0_2
       buildspec: codebuild/spec/buildspec_fuzz.yml
       debug-session: true
diff --git a/codebuild/spec/buildspec_sanitizer.yml b/codebuild/spec/buildspec_sanitizer.yml
index 189456f2af5..be60c52a8f5 100644
--- a/codebuild/spec/buildspec_sanitizer.yml
+++ b/codebuild/spec/buildspec_sanitizer.yml
@@ -45,6 +45,12 @@ batch:
         variables:
           S2N_LIBCRYPTO: awslc
           COMPILER: clang
+    - identifier: clang_awslc_fips_2022
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          S2N_LIBCRYPTO: awslc-fips-2022
+          COMPILER: clang
     - identifier: clang_openssl_3_0
       env:
         compute-type: BUILD_GENERAL1_LARGE
@@ -69,6 +75,12 @@ batch:
         variables:
           S2N_LIBCRYPTO: awslc
           COMPILER: gcc
+    - identifier: gcc_awslc_fips_2022
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          S2N_LIBCRYPTO: awslc-fips-2022
+          COMPILER: gcc
     - identifier: gcc_openssl_3_0
       env:
         compute-type: BUILD_GENERAL1_LARGE
diff --git a/codebuild/spec/buildspec_valgrind.yml b/codebuild/spec/buildspec_valgrind.yml
index 3c933957699..d2b14abc9e2 100644
--- a/codebuild/spec/buildspec_valgrind.yml
+++ b/codebuild/spec/buildspec_valgrind.yml
@@ -29,6 +29,13 @@ batch:
         variables:
           S2N_LIBCRYPTO: awslc-fips
           COMPILER: gcc
+    - identifier: gcc_awslc_fips_2022
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
+        variables:
+          S2N_LIBCRYPTO: awslc-fips-2022
+          COMPILER: gcc
     - identifier: gcc_openssl_3_0
       env:
         compute-type: BUILD_GENERAL1_LARGE