diff --git a/CMakeLists.txt b/CMakeLists.txt
index 395f358..64fb944 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,26 @@ option(AURORA_ENABLE_CARD "Enable CARD implementation based on kabufuda" ON)
 option(AURORA_ENABLE_RMLUI "Enable HTML/CSS Based UI Library for use in end-user UI development." OFF)
 option(AURORA_CACHE_USE_ZSTD "Compress WebGPU cache entries with zstd" ON)
 
+# Specifies a cache string and previous values to forcibly migrate from
+macro(_aurora_dependency_version name value doc)
+  set(_aurora_old_defaults ${ARGN})
+  if (DEFINED CACHE{${name}} AND ${name} IN_LIST _aurora_old_defaults)
+    message(STATUS "aurora: Migrating ${name} from old default ${${name}} to ${value}")
+    set(${name} "${value}" CACHE STRING "${doc}" FORCE)
+  else ()
+    set(${name} "${value}" CACHE STRING "${doc}")
+  endif ()
+  unset(_aurora_old_defaults)
+endmacro()
+
 # Dependency versions
-set(AURORA_DAWN_VERSION "v20260603.191052" CACHE STRING "Dawn prebuilt version tag (https://github.com/encounter/dawn-build/releases)")
-set(AURORA_DAWN_REF "13abc3bc8ea2d3c2050f9e77a12d012108ceee24" CACHE STRING "Dawn commit ref (https://github.com/google/dawn)")
-set(AURORA_SDL3_VERSION "3.4.10" CACHE STRING "SDL3 prebuilt version tag (https://github.com/libsdl-org/SDL/releases)")
-set(AURORA_SDL3_REF "refs/tags/release-3.4.10" CACHE STRING "SDL3 commit ref (https://github.com/libsdl-org/SDL)")
-set(AURORA_NOD_VERSION "v2.0.0-alpha.10" CACHE STRING "nod version tag (https://github.com/encounter/nod/releases)")
+_aurora_dependency_version(AURORA_DAWN_VERSION "v20260618.032059" "Dawn prebuilt version tag (https://github.com/encounter/dawn/releases)"
+        "v20260523.201736" "v20260603.191052") # Previous versions
+_aurora_dependency_version(AURORA_DAWN_REF "266c1cf8de969a364afa4fa49311631fc99a881e" "Dawn commit ref (https://github.com/encounter/dawn)"
+        "9aa45f938d4b36626722bbfdc2f18447179337e6" "13abc3bc8ea2d3c2050f9e77a12d012108ceee24") # Previous versions
+_aurora_dependency_version(AURORA_SDL3_VERSION "3.4.10" "SDL3 prebuilt version tag (https://github.com/libsdl-org/SDL/releases)")
+_aurora_dependency_version(AURORA_SDL3_REF "refs/tags/release-3.4.10" "SDL3 commit ref (https://github.com/libsdl-org/SDL)")
+_aurora_dependency_version(AURORA_NOD_VERSION "v2.0.0-alpha.10" "nod version tag (https://github.com/encounter/nod/releases)")
 
 # Platform-specific defaults
 set(_default_provider "auto")
diff --git a/cmake/AuroraDawnProvider.cmake b/cmake/AuroraDawnProvider.cmake
index 4bb7e3e..a0ad064 100644
--- a/cmake/AuroraDawnProvider.cmake
+++ b/cmake/AuroraDawnProvider.cmake
@@ -134,7 +134,7 @@ if (_aurora_dawn_provider STREQUAL "vendor")
 
     include(FetchContent)
     FetchContent_Declare(dawn
-      URL "https://github.com/google/dawn/archive/${AURORA_DAWN_REF}.tar.gz"
+      URL "https://github.com/encounter/dawn/archive/${AURORA_DAWN_REF}.tar.gz"
       DOWNLOAD_EXTRACT_TIMESTAMP FALSE
       EXCLUDE_FROM_ALL
     )
@@ -183,7 +183,7 @@ elseif (_aurora_dawn_provider STREQUAL "package")
         " with CMAKE_OSX_ARCHITECTURES='${CMAKE_OSX_ARCHITECTURES}'.")
     endif ()
     set(AURORA_DAWN_PACKAGE_URL
-      "https://github.com/encounter/dawn-build/releases/download/${AURORA_DAWN_VERSION}/dawn-${_dawn_system}-${_dawn_arch}.tar.gz")
+      "https://github.com/encounter/dawn/releases/download/${AURORA_DAWN_VERSION}/dawn-${_dawn_system}-${_dawn_arch}.tar.gz")
   endif ()
   message(STATUS "aurora: Fetching prebuilt Dawn package from ${AURORA_DAWN_PACKAGE_URL}")