diff --git a/apps/events-helsinki/.env.local.example b/apps/events-helsinki/.env.local.example
index 5ff2ce482..5ca52dcf7 100644
--- a/apps/events-helsinki/.env.local.example
+++ b/apps/events-helsinki/.env.local.example
@@ -1,5 +1,5 @@
 NEXT_PUBLIC_CMS_ORIGIN="https://tapahtumat.hkih.stage.geniem.io"
-NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT="https://events-graphql-federation-events.test.kuva.hel.ninja/"
+NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT="https://events-graphql-federation-events.test.hel.ninja/"
 NEXT_PUBLIC_LINKEDEVENTS_EVENT_ENDPOINT="https://api.hel.fi/linkedevents/v1/event"
 NEXT_PUBLIC_APP_ORIGIN="http://localhost:3000"
 NEXT_PUBLIC_IMAGE_PROXY_URL="https://images.weserv.nl/?w=1024&url="
diff --git a/apps/events-helsinki/.env.test b/apps/events-helsinki/.env.test
index 29a464d98..da99a22b6 100644
--- a/apps/events-helsinki/.env.test
+++ b/apps/events-helsinki/.env.test
@@ -1,5 +1,5 @@
 NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
-NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-events.test.kuva.hel.ninja/
+NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-events.test.hel.ninja/
 NEXT_PUBLIC_CMS_ORIGIN=https://tapahtumat.hkih.stage.geniem.io
 NEXT_PUBLIC_LINKEDEVENTS_EVENT_ENDPOINT=https://api.hel.fi/linkedevents/v1/event
 NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=
\ No newline at end of file
diff --git a/apps/hobbies-helsinki/.env.local.example b/apps/hobbies-helsinki/.env.local.example
index e2125319a..3d6828a15 100644
--- a/apps/hobbies-helsinki/.env.local.example
+++ b/apps/hobbies-helsinki/.env.local.example
@@ -1,4 +1,4 @@
-NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT="https://events-graphql-federation-hobbies.test.kuva.hel.ninja/"
+NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT="https://events-graphql-federation-hobbies.test.hel.ninja/"
 NEXT_PUBLIC_CMS_ORIGIN="https://harrastus.hkih.stage.geniem.io"
 NEXT_PUBLIC_LINKEDEVENTS_EVENT_ENDPOINT="https://api.hel.fi/linkedevents/v1/event"
 NEXT_PUBLIC_APP_ORIGIN="http://localhost:3000"
diff --git a/apps/hobbies-helsinki/.env.test b/apps/hobbies-helsinki/.env.test
index 8c5217e08..22673b988 100644
--- a/apps/hobbies-helsinki/.env.test
+++ b/apps/hobbies-helsinki/.env.test
@@ -1,5 +1,5 @@
 NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
-NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-hobbies.test.kuva.hel.ninja/
+NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-hobbies.test.hel.ninja/
 NEXT_PUBLIC_CMS_ORIGIN=https://harrastus.hkih.stage.geniem.io
 NEXT_PUBLIC_LINKEDEVENTS_EVENT_ENDPOINT=https://api.hel.fi/linkedevents/v1/event
 NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=
\ No newline at end of file
diff --git a/apps/sports-helsinki/.env.local.example b/apps/sports-helsinki/.env.local.example
index ad66c4dbe..2a685a22d 100644
--- a/apps/sports-helsinki/.env.local.example
+++ b/apps/sports-helsinki/.env.local.example
@@ -1,4 +1,4 @@
-NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT="https://events-graphql-federation-sports.test.kuva.hel.ninja/"
+NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT="https://events-graphql-federation-sports.test.hel.ninja/"
 NEXT_PUBLIC_CMS_ORIGIN="https://liikunta.hkih.stage.geniem.io"
 NEXT_PUBLIC_LINKEDEVENTS_EVENT_ENDPOINT="https://api.hel.fi/linkedevents/v1/event"
 NEXT_PUBLIC_APP_ORIGIN="http://localhost:3000"
diff --git a/apps/sports-helsinki/.env.test b/apps/sports-helsinki/.env.test
index 72ebebbd7..a9f6b2960 100644
--- a/apps/sports-helsinki/.env.test
+++ b/apps/sports-helsinki/.env.test
@@ -1,5 +1,5 @@
 NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
-NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-hobbies.test.kuva.hel.ninja/
+NEXT_PUBLIC_FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-hobbies.test.hel.ninja/
 NEXT_PUBLIC_CMS_ORIGIN=https://liikunta.hkih.stage.geniem.io
 NEXT_PUBLIC_LINKEDEVENTS_EVENT_ENDPOINT=https://api.hel.fi/linkedevents/v1/event
 NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=
\ No newline at end of file
diff --git a/proxies/events-graphql-federation/README.md b/proxies/events-graphql-federation/README.md
index 052538b01..d93e9014b 100644
--- a/proxies/events-graphql-federation/README.md
+++ b/proxies/events-graphql-federation/README.md
@@ -17,9 +17,9 @@ Apollo's Supergraph-demo repository: https://github.com/apollographql/supergraph
 
 ### Staging
 
-- Hobbies-Helsinki: https://events-graphql-federation-hobbies.test.kuva.hel.ninja/
-- Events-Helsinki: https://events-graphql-federation-events.test.kuva.hel.ninja/
-- Sports-Helsinki: https://events-graphql-federation-sports.test.kuva.hel.ninja/
+- Hobbies-Helsinki: https://events-graphql-federation-hobbies.test.hel.ninja/
+- Events-Helsinki: https://events-graphql-federation-events.test.hel.ninja/
+- Sports-Helsinki: https://events-graphql-federation-sports.test.hel.ninja/
 
 ## Local development