diff --git a/cmake/defaults/CYCOMMON.cmake b/cmake/defaults/CYCOMMON.cmake
index 472db3ac2..948ec855d 100644
--- a/cmake/defaults/CYCOMMON.cmake
+++ b/cmake/defaults/CYCOMMON.cmake
@@ -1,9 +1,9 @@
 # Common build dependencies for all CY20XX platforms aja https://github.com/aja-video/libajantv2
 SET(RV_DEPS_AJA_VERSION
-    "17.1.0"
+    "17.6.0.hotfix1"
 )
 SET(RV_DEPS_AJA_DOWNLOAD_HASH
-    "b9d189f77e18dbdff7c39a339b1a5dd4"
+    "dba447ddd1b0ee84cee8441c0adba06a"
 )
 
 # atomic_ops https://github.com/ivmai/libatomic_ops
diff --git a/cmake/dependencies/aja.cmake b/cmake/dependencies/aja.cmake
index e45d1cb46..b47ebb63a 100644
--- a/cmake/dependencies/aja.cmake
+++ b/cmake/dependencies/aja.cmake
@@ -17,7 +17,9 @@ SET(_download_hash
     "${RV_DEPS_AJA_DOWNLOAD_HASH}"
 )
 
-IF(RV_TARGET_WINDOWS)
+IF(RV_TARGET_WINDOWS
+   AND CMAKE_BUILD_TYPE MATCHES "^Debug$"
+)
   RV_MAKE_STANDARD_LIB_NAME(ajantv2_vs143_MT "" "SHARED" "d")
 ELSE()
   RV_MAKE_STANDARD_LIB_NAME(ajantv2 "" "SHARED" "d")
@@ -30,28 +32,6 @@ SET(_aja_include_dir
     ${_include_dir}/libajantv2
 )
 
-IF(RHEL_VERBOSE)
-  SET(_mbedtls_lib_dir
-      ${_build_dir}/ajantv2/mbedtls-install/lib64
-  )
-ELSE()
-  SET(_mbedtls_lib_dir
-      ${_build_dir}/ajantv2/mbedtls-install/lib
-  )
-ENDIF()
-
-SET(_mbedtls_lib
-    ${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedtls${CMAKE_STATIC_LIBRARY_SUFFIX}
-)
-SET(_mbedx509_lib
-    ${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedx509${CMAKE_STATIC_LIBRARY_SUFFIX}
-)
-SET(_mbedcrypto_lib
-    ${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedcrypto${CMAKE_STATIC_LIBRARY_SUFFIX}
-)
-
-LIST(APPEND _byproducts ${_mbedtls_lib} ${_mbedx509_lib} ${_mbedcrypto_lib})
-
 # There is an issue with the recent AJA SDK : the OS specific header files are no longer copied to _aja_ntv2_include_dir Adding custom paths here to work around
 # this issue
 IF(RV_TARGET_LINUX)
@@ -75,6 +55,8 @@ LIST(
   "-DAJANTV2_DISABLE_TOOLS=ON"
   "-DAJANTV2_DISABLE_TESTS=ON"
   "-DAJANTV2_BUILD_SHARED=ON"
+  "-DAJANTV2_DISABLE_PLUGIN_LOAD=ON"
+  "-DAJANTV2_DISABLE_DRIVER=ON"
   "-DNTV2_VERSION_BUILD=0"
 )
 
@@ -97,7 +79,7 @@ EXTERNALPROJECT_ADD(
   INSTALL_DIR ${_install_dir}
   CONFIGURE_COMMAND ${CMAKE_COMMAND} ${_configure_options}
   BUILD_COMMAND ${_cmake_build_command}
-  INSTALL_COMMAND ${_cmake_install_command} && ${CMAKE_COMMAND} -E copy_directory ${_mbedtls_lib_dir} ${_lib_dir}
+  INSTALL_COMMAND ${_cmake_install_command}
   BUILD_IN_SOURCE FALSE
   BUILD_ALWAYS FALSE
   BUILD_BYPRODUCTS ${_byproducts}
@@ -126,11 +108,6 @@ RV_ADD_IMPORTED_LIBRARY(
   ADD_TO_DEPS_LIST
 )
 
-TARGET_LINK_LIBRARIES(
-  aja::ntv2
-  INTERFACE ${_mbedtls_lib} ${_mbedx509_lib} ${_mbedcrypto_lib}
-)
-
 IF(RV_TARGET_DARWIN)
   LIST(APPEND _aja_compile_options "-DAJAMac=1")
   LIST(APPEND _aja_compile_options "-DAJA_MAC=1")