diff --git a/pyodide_build/xbuildenv_releases.py b/pyodide_build/xbuildenv_releases.py
index 5cdf46bc..d5d13fbd 100644
--- a/pyodide_build/xbuildenv_releases.py
+++ b/pyodide_build/xbuildenv_releases.py
@@ -6,7 +6,9 @@
 from packaging.version import Version
 from pydantic import BaseModel, ConfigDict
 
-DEFAULT_CROSS_BUILD_ENV_METADATA_URL = "https://raw.githubusercontent.com/pyodide/pyodide/main/pyodide-cross-build-environments.json"
+DEFAULT_CROSS_BUILD_ENV_METADATA_URL = (
+    "https://pyodide.github.io/pyodide/api/pyodide-cross-build-environments.json"
+)
 CROSS_BUILD_ENV_METADATA_URL_ENV_VAR = "PYODIDE_CROSS_BUILD_ENV_METADATA_URL"
 
 
@@ -214,11 +216,13 @@ def cross_build_env_metadata_url() -> str:
     # This has two purposes:
     # 1. When running tests, we can set this variable to use a local metadata file
     # 2. If we change the URL for the metadata file, people can set this variable to use the new URL
-    url = os.environ.get(CROSS_BUILD_ENV_METADATA_URL_ENV_VAR)
-    if url is not None:
-        return url
 
-    return DEFAULT_CROSS_BUILD_ENV_METADATA_URL
+    url = os.environ.get(
+        key=CROSS_BUILD_ENV_METADATA_URL_ENV_VAR,
+        default=DEFAULT_CROSS_BUILD_ENV_METADATA_URL,
+    )
+
+    return url
 
 
 @cache