diff --git a/homeassistant/util/location.py b/homeassistant/util/location.py
index 4e76fa32de3..e653b439e0e 100644
--- a/homeassistant/util/location.py
+++ b/homeassistant/util/location.py
@@ -14,8 +14,8 @@ import aiohttp
 
 from homeassistant.const import __version__ as HA_VERSION
 
-WHOAMI_URL = "https://whoami.home-assistant.io/v1"
-WHOAMI_URL_DEV = "https://whoami-v1-dev.home-assistant.workers.dev/v1"
+WHOAMI_URL = "https://services.home-assistant.io/whoami/v1"
+WHOAMI_URL_DEV = "https://services-dev.home-assistant.workers.dev/whoami/v1"
 
 # Constants from https://github.com/maurycyp/vincenty
 # Earth ellipsoid according to WGS 84
diff --git a/tests/util/test_location.py b/tests/util/test_location.py
index 3dff36744ee..d8d86965733 100644
--- a/tests/util/test_location.py
+++ b/tests/util/test_location.py
@@ -74,7 +74,7 @@ def test_get_miles():
 
 
 async def test_detect_location_info_whoami(aioclient_mock, session):
-    """Test detect location info using whoami.home-assistant.io."""
+    """Test detect location info using services.home-assistant.io/whoami."""
     aioclient_mock.get(location_util.WHOAMI_URL, text=load_fixture("whoami.json"))
 
     with patch("homeassistant.util.location.HA_VERSION", "1.0"):