diff --git a/build_files/build_environment/cmake/ogg.cmake b/build_files/build_environment/cmake/ogg.cmake
index c9062c7ce33..eff23d21f61 100644
--- a/build_files/build_environment/cmake/ogg.cmake
+++ b/build_files/build_environment/cmake/ogg.cmake
@@ -2,25 +2,11 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-if(NOT WIN32)
-  ExternalProject_Add(external_ogg
-    URL file://${PACKAGE_DIR}/${OGG_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
-    PREFIX ${BUILD_DIR}/ogg
-    PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ogg/src/external_ogg < ${PATCH_DIR}/ogg.diff
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static
-    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
-    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install
-    INSTALL_DIR ${LIBDIR}/ogg
-  )
-else()
-  ExternalProject_Add(external_ogg
-    URL file://${PACKAGE_DIR}/${OGG_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
-    PREFIX ${BUILD_DIR}/ogg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ogg ${DEFAULT_CMAKE_FLAGS}
-    INSTALL_DIR ${LIBDIR}/ogg
-  )
-endif()
+ExternalProject_Add(external_ogg
+  URL file://${PACKAGE_DIR}/${OGG_FILE}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
+  PREFIX ${BUILD_DIR}/ogg
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ogg ${DEFAULT_CMAKE_FLAGS}
+  INSTALL_DIR ${LIBDIR}/ogg
+)
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index d38bc79cf14..72e8ad54072 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -175,8 +175,8 @@ set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
 set(OPENIMAGEIO_VERSION v2.4.15.0)
-set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH aa4f077e5ba2a2e548afc1c4faddd8ff)
+set(OPENIMAGEIO_URI https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
+set(OPENIMAGEIO_HASH 784391406ee309075a3f82e60a42f023)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
diff --git a/build_files/build_environment/cmake/vorbis.cmake b/build_files/build_environment/cmake/vorbis.cmake
index 6d73bc54146..13074256cdc 100644
--- a/build_files/build_environment/cmake/vorbis.cmake
+++ b/build_files/build_environment/cmake/vorbis.cmake
@@ -2,22 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-if(NOT WIN32)
-  ExternalProject_Add(external_vorbis
-    URL file://${PACKAGE_DIR}/${VORBIS_FILE}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH ${VORBIS_HASH_TYPE}=${VORBIS_HASH}
-    PREFIX ${BUILD_DIR}/vorbis
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
-      --disable-shared
-      --enable-static
-      --with-pic
-      --with-ogg=${LIBDIR}/ogg
-    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make -j${MAKE_THREADS}
-    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make install
-    INSTALL_DIR ${LIBDIR}/vorbis
-  )
-else()
 ExternalProject_Add(external_vorbis
     URL file://${PACKAGE_DIR}/${VORBIS_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -26,7 +10,6 @@ ExternalProject_Add(external_vorbis
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vorbis -DOGG_ROOT=${LIBDIR}/ogg ${DEFAULT_CMAKE_FLAGS}
     INSTALL_DIR ${LIBDIR}/vorbis
   )
-endif()
 
 add_dependencies(
   external_vorbis