diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 66cc714a66..eb22b3aa74 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -40,26 +40,28 @@ endif()
 
 set(BUILD_ONLY core)
 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        ${EXTRA_ARGS}
+        "-DENABLE_UNITY_BUILD=ON"
+        "-DENABLE_TESTING=OFF"
+        "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
+        "-DBUILD_ONLY=${BUILD_ONLY}"
+        "-DBUILD_DEPS=OFF"
+        "-DBUILD_SHARED_LIBS=OFF"
+        "-DCMAKE_INSTALL_RPATH=${rpath}"
+        "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+)
+vcpkg_cmake_install()
 
 foreach(TARGET IN LISTS BUILD_ONLY)
-    message(STATUS "Building ${TARGET}")
-    vcpkg_cmake_configure(
-        SOURCE_PATH "${SOURCE_PATH}"
-        DISABLE_PARALLEL_CONFIGURE
-        OPTIONS
-            ${EXTRA_ARGS}
-            "-DENABLE_UNITY_BUILD=ON"
-            "-DENABLE_TESTING=OFF"
-            "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
-            "-DBUILD_ONLY=${TARGET}"
-            "-DBUILD_DEPS=OFF"
-            "-DCMAKE_INSTALL_RPATH=${rpath}"
-            "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
-    )
-    vcpkg_cmake_install()
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
-    vcpkg_copy_pdbs()
-endforeach()
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+endforeach() 
+vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")
+
+vcpkg_copy_pdbs()
 
 file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")
 foreach(AWS_TARGET IN LISTS AWS_TARGETS)
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 3007b888bb..211e80e6dd 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -2,7 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.96",
-  "port-version": 1,
+  "port-version": 2,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!arm & !uwp",
diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake
index ee7d239069..151ba02819 100644
--- a/ports/s2n/portfile.cmake
+++ b/ports/s2n/portfile.cmake
@@ -8,15 +8,18 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
 )
 
 vcpkg_cmake_install()
 
 file(GLOB SHARED_CMAKE_FILES
      "${CURRENT_PACKAGES_DIR}/debug/lib/s2n"
+     "${CURRENT_PACKAGES_DIR}/lib/s2n"
      )
-file(COPY "${SHARED_CMAKE_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+
+foreach(FILE ${SHARED_CMAKE_FILES})
+    file(COPY "${FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+endforeach()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug"
diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json
index d1fda96cae..51359206eb 100644
--- a/ports/s2n/vcpkg.json
+++ b/ports/s2n/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "s2n",
   "version": "1.0.17",
+  "port-version": 1,
   "description": "C99 implementation of the TLS/SSL protocols.",
   "homepage": "https://github.com/aws/s2n-tls",
   "supports": "!uwp & !windows",
diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 43f797703a..e3c650d039 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1c6b4335305034bea75f07f368e51142abddb789",
+      "version": "1.9.96",
+      "port-version": 2
+    },
     {
       "git-tree": "5989ba8996df75b9195ef2f429191b48602236c9",
       "version": "1.9.96",
diff --git a/versions/baseline.json b/versions/baseline.json
index 764d04d4ec..a86bafbdaf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -298,7 +298,7 @@
     },
     "aws-sdk-cpp": {
       "baseline": "1.9.96",
-      "port-version": 1
+      "port-version": 2
     },
     "azmq": {
       "baseline": "2020-03-03",
@@ -5846,7 +5846,7 @@
     },
     "s2n": {
       "baseline": "1.0.17",
-      "port-version": 0
+      "port-version": 1
     },
     "safeint": {
       "baseline": "3.0.26",
diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json
index 422be50ca7..95229e705a 100644
--- a/versions/s-/s2n.json
+++ b/versions/s-/s2n.json
@@ -1,9 +1,14 @@
 {
   "versions": [
+    {
+      "git-tree": "8df5dce6a28decc5f853d2efd6d657374709d1b2",
+      "version": "1.0.17",
+      "port-version": 1
+    },
     {
       "git-tree": "10a083844c389053abc2f6ca624f9080712b6b34",
       "version": "1.0.17",
       "port-version": 0
     }
   ]
-}
\ No newline at end of file
+}