diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake
index cdca97d376..d50966c4e7 100644
--- a/ports/apr-util/portfile.cmake
+++ b/ports/apr-util/portfile.cmake
@@ -63,7 +63,6 @@ else()
 
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
-        NO_DEBUG
         OPTIONS 
             "--prefix=${CURRENT_INSTALLED_DIR}"
             "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr"
diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json
index 448c05f305..0dbff727e0 100644
--- a/ports/apr-util/vcpkg.json
+++ b/ports/apr-util/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr-util",
   "version": "1.6.1",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
   "dependencies": [
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index a7b81a921f..eb0fc8708f 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -64,7 +64,6 @@ else()
     set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration")
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
-        NO_DEBUG
         OPTIONS
             "--prefix=${CURRENT_INSTALLED_DIR}"
             "${CONFIGURE_PARAMETER_1}"
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
index 53dcc1a5ae..afeff1d238 100644
--- a/ports/apr/vcpkg.json
+++ b/ports/apr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr",
   "version": "1.7.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
   "homepage": "https://apr.apache.org/",
   "supports": "!uwp",
diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake
index 4aa5214209..276f68fb48 100644
--- a/ports/liburing/portfile.cmake
+++ b/ports/liburing/portfile.cmake
@@ -13,7 +13,6 @@ vcpkg_from_github(
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
     COPY_SOURCE
-    NO_DEBUG
 )
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json
index d0300ff8be..17ba8c16cb 100644
--- a/ports/liburing/vcpkg.json
+++ b/ports/liburing/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liburing",
   "version": "2.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Linux-native io_uring I/O access library",
   "homepage": "https://github.com/axboe/liburing",
   "supports": "linux"
diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake
index ec320fc226..dd5b061eea 100755
--- a/scripts/cmake/vcpkg_build_make.cmake
+++ b/scripts/cmake/vcpkg_build_make.cmake
@@ -124,6 +124,9 @@ function(vcpkg_build_make)
     vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS)
 
     foreach(buildtype IN ITEMS "debug" "release")
+        if (buildtype STREQUAL "debug" AND _VCPKG_MAKE_NO_DEBUG)
+            continue()
+        endif()
         if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}")
             if("${buildtype}" STREQUAL "debug")
                 set(short_buildtype "-dbg")
@@ -251,4 +254,5 @@ function(vcpkg_build_make)
     endif()
 
     vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS)
+    unset(_VCPKG_MAKE_NO_DEBUG PARENT_SCOPE)
 endfunction()
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
index 04796ed2e8..3e9c437876 100644
--- a/scripts/cmake/vcpkg_configure_make.cmake
+++ b/scripts/cmake/vcpkg_configure_make.cmake
@@ -228,11 +228,15 @@ endmacro()
 function(vcpkg_configure_make)
     # parse parameters such that semicolons in options arguments to COMMAND don't get erased
     cmake_parse_arguments(PARSE_ARGV 0 arg
-        "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET"
+        "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET"
         "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET"
         "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES"
     )
 
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+
     z_vcpkg_get_cmake_vars(cmake_vars_file)
     debug_message("Including cmake vars from: ${cmake_vars_file}")
     include("${cmake_vars_file}")
@@ -866,4 +870,5 @@ function(vcpkg_configure_make)
 
     set(_VCPKG_PROJECT_SOURCE_PATH ${arg_SOURCE_PATH} PARENT_SCOPE)
     set(_VCPKG_PROJECT_SUBPATH ${arg_PROJECT_SUBPATH} PARENT_SCOPE)
+    set(_VCPKG_MAKE_NO_DEBUG ${arg_NO_DEBUG} PARENT_SCOPE)
 endfunction()
diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json
index 5cb8b4d738..7eaa48d204 100644
--- a/versions/a-/apr-util.json
+++ b/versions/a-/apr-util.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629",
+      "version": "1.6.1",
+      "port-version": 7
+    },
     {
       "git-tree": "d27be40b8f670b002604154ef5657c011b8de733",
       "version": "1.6.1",
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 87aaa252f1..d1baaa2822 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101",
+      "version": "1.7.0",
+      "port-version": 7
+    },
     {
       "git-tree": "bc5604f4ffbdcdaee979fccdb1fd5a85dfc7a3db",
       "version": "1.7.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 76914bbced..21995db3b5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -110,11 +110,11 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 6
+      "port-version": 7
     },
     "apr-util": {
       "baseline": "1.6.1",
-      "port-version": 6
+      "port-version": 7
     },
     "apsi": {
       "baseline": "0.7.0",
@@ -4066,7 +4066,7 @@
     },
     "liburing": {
       "baseline": "2.0",
-      "port-version": 1
+      "port-version": 2
     },
     "libusb": {
       "baseline": "1.0.24",
diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json
index 3ebb4cd25e..b5e32b3429 100644
--- a/versions/l-/liburing.json
+++ b/versions/l-/liburing.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65bbf5b3f642b9e76a659d78a9077d207c827b76",
+      "version": "2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "e193d537e05887e8efeae8ab1328dc7e33499e01",
       "version": "2.0",