diff --git a/recipes-sdk/aws-c-cal/aws-c-cal_0.8.1.bb b/recipes-sdk/aws-c-cal/aws-c-cal_0.8.1.bb
index 0184507cd..6d28ce6cf 100644
--- a/recipes-sdk/aws-c-cal/aws-c-cal_0.8.1.bb
+++ b/recipes-sdk/aws-c-cal/aws-c-cal_0.8.1.bb
@@ -37,6 +37,7 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTING=ON -DCMAKE_CROSSCOMPILING=OFF,-DBUI
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
 
 FILES:${PN}-dev += "${libdir}/*/cmake"
+FILES:${PN}-staticdev += "${libdir}/lib*.a"
 
 RDEPENDS:${PN} = "\
     aws-c-common \
diff --git a/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.29.9.bb b/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.29.9.bb
index 134250f1f..6718349db 100644
--- a/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.29.9.bb
+++ b/recipes-sdk/aws-crt-cpp/aws-crt-cpp_0.29.9.bb
@@ -43,10 +43,12 @@ EXTRA_OECMAKE += "\
 # for generating Makefiles to run tests
 OECMAKE_GENERATOR = "Unix Makefiles"
 
-PACKAGECONFIG ??= "\
+PACKAGECONFIG ?= "\
     ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)} \
     "
 
+PACKAGECONFIG:append:x86-64 = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'sanitize', '', d)}"
+
 # enable PACKAGECONFIG = "static" to build static instead of shared libs
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
 
@@ -69,3 +71,8 @@ do_install_ptest () {
     install -d ${D}${PTEST_PATH}/tests
     install -m 0755 ${B}/tests/aws-crt-cpp-tests ${D}${PTEST_PATH}/tests/
 }
+
+# -fsanitize=address does cause this
+# nooelint: oelint.vars.insaneskip:INSANE_SKIP
+INSANE_SKIP:x86-64 += "${@bb.utils.contains('PACKAGECONFIG', 'sanitize', 'buildpaths', '', d)}"
+PACKAGECONFIG[sanitize] = "-DENABLE_SANITIZERS=ON -DSANITIZERS=address, -DENABLE_SANITIZERS=OFF,gcc-sanitizers"
diff --git a/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.488.bb b/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.488.bb
index f9965034e..23bc380f7 100644
--- a/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.488.bb
+++ b/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.488.bb
@@ -25,9 +25,12 @@ S = "${WORKDIR}/git"
 
 inherit cmake ptest pkgconfig
 
-PACKAGECONFIG ??= "\
+PACKAGECONFIG ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \
-    ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)} \
+    "
+
+PACKAGECONFIG:append:x86-64 = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'sanitize', '', d)}"
 
 PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio"
 
@@ -43,6 +46,7 @@ python populate_packages:prepend () {
     do_split_packages(d, d.expand('${libdir}'), r'^lib(.*)\.so$', '%s', 'library for %s', extra_depends='', prepend=True, hook=hook)
 
     d.setVar("AWS_SDK_PACKAGES", " ".join(packages))
+
 }
 
 # enable PACKAGECONFIG = "static" to build static instead of shared libs
@@ -63,8 +67,8 @@ OECMAKE_CXX_FLAGS += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Wno-maybe-uni
 OECMAKE_CXX_FLAGS += "-Wno-psabi"
 
 EXTRA_OECMAKE += "\
-     -DBUILD_DEPS=OFF \
-     -DCMAKE_MODULE_PATH=${STAGING_LIBDIR}/cmake \
+    -DBUILD_DEPS=OFF \
+    -DCMAKE_MODULE_PATH=${STAGING_LIBDIR}/cmake \
 "
 
 RDEPENDS:${PN}-ptest += "\
@@ -86,3 +90,9 @@ do_install_ptest () {
 # https://github.com/aws/aws-sdk-cpp/issues/2242
 # nooelint: oelint.vars.insaneskip:INSANE_SKIP
 INSANE_SKIP:${PN}-src:append:class-target:arm = " buildpaths"
+
+# -fsanitize=address does cause this
+# nooelint: oelint.vars.insaneskip:INSANE_SKIP
+INSANE_SKIP:x86-64 += "${@bb.utils.contains('PACKAGECONFIG', 'sanitize', 'buildpaths', '', d)}"
+
+PACKAGECONFIG[sanitize] = "'-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -g -fsanitize=address -fno-omit-frame-pointer',,gcc-sanitizers"
diff --git a/recipes-sdk/s2n/s2n_1.5.11.bb b/recipes-sdk/s2n/s2n_1.5.11.bb
index 7a825a743..038699430 100644
--- a/recipes-sdk/s2n/s2n_1.5.11.bb
+++ b/recipes-sdk/s2n/s2n_1.5.11.bb
@@ -5,7 +5,9 @@ LICENSE = "Apache-2.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "${@bb.utils.contains('PACKAGECONFIG', 'static', 'aws-lc', 'openssl', d)}"
+DEPENDS = "\
+    ${@bb.utils.contains('PACKAGECONFIG', 'static', 'aws-lc', 'openssl', d)} \
+    "
 
 PROVIDES += "aws/s2n"
 
@@ -24,10 +26,14 @@ inherit cmake ptest pkgconfig
 
 CFLAGS:append = " -Wl,-Bsymbolic"
 
-PACKAGECONFIG ??= "\
+PACKAGECONFIG ?= "\
     ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)} \
     "
 
+PACKAGECONFIG:append:x86-64 = "\
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'sanitize', '', d)} \
+    "
+
 # enable PACKAGECONFIG = "static" to build static instead of shared libs
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
 
@@ -56,3 +62,5 @@ do_install_ptest () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+PACKAGECONFIG[sanitize] = "-DS2N_ADDRESS_SANITIZER=ON, -DS2N_ADDRESS_SANITIZER=OFF, gcc-sanitizers"