diff --git a/CMakeLists.txt b/CMakeLists.txt
index 048f1eec9..8863ccf56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,8 +83,8 @@ if(BUILD_DEPS)
     add_subdirectory(crt/aws-c-common)
 
     if(UNIX AND NOT APPLE AND NOT BYO_CRYPTO)
+        include(AwsPrebuildDependency)
         if(NOT USE_OPENSSL)
-            include(AwsPrebuildDependency)
 
             set(AWSLC_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
@@ -116,8 +116,14 @@ if(BUILD_DEPS)
             )
         endif()
 
-        set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N")
-        add_subdirectory(crt/s2n)
+        # prebuild s2n-tls.
+        aws_prebuild_dependency(
+            DEPENDENCY_NAME S2N
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/s2n
+            CMAKE_ARGUMENTS
+                -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
+                -DBUILD_TESTING=OFF
+        )
     endif()
 
     add_subdirectory(crt/aws-c-sdkutils)
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
index 877c029fc..48d647bf4 160000
--- a/crt/aws-c-auth
+++ b/crt/aws-c-auth
@@ -1 +1 @@
-Subproject commit 877c029fc4e93d205f9c6855188c3c51f6b497b4
+Subproject commit 48d647bf43f8872e4dc5ec6343b0c5974195fbdd
diff --git a/crt/aws-c-common b/crt/aws-c-common
index 672cc0032..b9959f592 160000
--- a/crt/aws-c-common
+++ b/crt/aws-c-common
@@ -1 +1 @@
-Subproject commit 672cc0032eb28d69fbdd22c9463253c89d7a6f30
+Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c
diff --git a/crt/aws-c-http b/crt/aws-c-http
index 4e74ab1e3..6068653e1 160000
--- a/crt/aws-c-http
+++ b/crt/aws-c-http
@@ -1 +1 @@
-Subproject commit 4e74ab1e3702763e0b87bd1752f5a37c2f0400ac
+Subproject commit 6068653e1d582bd8e7d1c9f81f86beaf10444e3d
diff --git a/crt/aws-c-io b/crt/aws-c-io
index c345d7727..dc41ddc49 160000
--- a/crt/aws-c-io
+++ b/crt/aws-c-io
@@ -1 +1 @@
-Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2
+Subproject commit dc41ddc498c10ebbf69aba7775afa36c8c1910bd
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
index ed7bbd68c..77d6f00e8 160000
--- a/crt/aws-c-mqtt
+++ b/crt/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit ed7bbd68c03d7022c915a2924740ab7992ad2311
+Subproject commit 77d6f00e89b10e3263d8a17576ec8e91c45b4606
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
index 0ab4d58ef..aede1d8c2 160000
--- a/crt/aws-c-s3
+++ b/crt/aws-c-s3
@@ -1 +1 @@
-Subproject commit 0ab4d58ef0bd97970d43828cb6b57a3de5747343
+Subproject commit aede1d8c24f9f580d5a96c089878e9b258b88d04
diff --git a/crt/aws-lc b/crt/aws-lc
index 2f1879759..8b2ebfcf3 160000
--- a/crt/aws-lc
+++ b/crt/aws-lc
@@ -1 +1 @@
-Subproject commit 2f1879759b2e0fc70592665bdf10087b64f44b7d
+Subproject commit 8b2ebfcf3fc8b0656f1f4161166484a70238aeaa
diff --git a/crt/s2n b/crt/s2n
index 87f4a0585..ffe0bf42d 160000
--- a/crt/s2n
+++ b/crt/s2n
@@ -1 +1 @@
-Subproject commit 87f4a0585dc3056433f193b9305f587cff239be3
+Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb