diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
index 41c7afb08..1944e195a 100644
--- a/.github/workflows/ci_workflow.yml
+++ b/.github/workflows/ci_workflow.yml
@@ -198,13 +198,12 @@ jobs:
             build-docs: 'OFF'
             build-openfx: 'ON'
             use-simd: 'ON'
-            use-oiio: 'ON'
+            use-oiio: 'OFF'
             cxx-standard: 20
             cxx-compiler: clang++
             cc-compiler: clang
             compiler-desc: Clang
             vfx-cy: 2023
-            container-tag: 2023.2
             install-ext-packages: MISSING
           - build: 2
             build-type: Release
@@ -218,7 +217,6 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2023
-            container-tag: 2023.2
             install-ext-packages: ALL
           - build: 1
             build-type: Release
@@ -232,7 +230,6 @@ jobs:
             cc-compiler: gcc
             compiler-desc: GCC
             vfx-cy: 2023
-            container-tag: 2023.2
             install-ext-packages: ALL
     env:
       CXX: ${{ matrix.cxx-compiler }}
diff --git a/.github/workflows/dependencies_latest.yml b/.github/workflows/dependencies_latest.yml
index c10131e0d..575737715 100644
--- a/.github/workflows/dependencies_latest.yml
+++ b/.github/workflows/dependencies_latest.yml
@@ -308,6 +308,7 @@ jobs:
         run: |
           vcpkg install zlib:x64-windows
           vcpkg install tiff:x64-windows
+          vcpkg install directx-headers:x64-windows
         shell: bash
       - name: Install fixed ext package versions
         # Minizip-ng depends on ZLIB. ZLIB must be installed first.
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 26c5cb291..43fad1ab9 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -7,9 +7,9 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-lts-latest
   tools:
-    python: "3.11"
+    python: "3.14"
 
 sphinx:
   configuration: docs/conf.py
diff --git a/share/cmake/modules/FindDirectX-Headers.cmake b/share/cmake/modules/FindDirectX-Headers.cmake
index 99f2788d4..8774af424 100644
--- a/share/cmake/modules/FindDirectX-Headers.cmake
+++ b/share/cmake/modules/FindDirectX-Headers.cmake
@@ -33,6 +33,10 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
         if(directx-headers_VERSION)
             set(DirectX-Headers_VERSION ${directx-headers_VERSION})
         endif()
+        if(TARGET Microsoft::DirectX-Headers AND NOT DirectX-Headers_INCLUDE_DIR)
+            get_target_property(DirectX-Headers_INCLUDE_DIR
+                Microsoft::DirectX-Headers INTERFACE_INCLUDE_DIRECTORIES)
+        endif()
     else()
         # Fall back to locating the public header directly (e.g. when the
         # headers were installed without the CMake config, or are provided