diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6af97ebfc..227b8ef3d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
 Fix #<gh-issue-id>
 
 Test URLs:
-- Before: https://main--danaher-ls-aem--hlxsites.hlx.page/
-- After: https://<branch>--danaher-ls-aem--hlxsites.hlx.page/
+- Before: https://main--danaher-ls-aem--hlxsites.aem.page/
+- After: https://<branch>--danaher-ls-aem--hlxsites.aem.page/
diff --git a/README.md b/README.md
index c90e73aa3..8e5d4cb4b 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 Live Website:  https://lifesciences.danaher.com/
 
 ## Environments
-- Preview: https://main--danaher-ls-aem--hlxsites.hlx.page/
-- Live: https://main--danaher-ls-aem--hlxsites.hlx.live/
+- Preview: https://main--danaher-ls-aem--hlxsites.aem.page/
+- Live: https://main--danaher-ls-aem--hlxsites.aem.live/
 - Public: https://stage.lifesciences.danaher.com/
 
 ## Installation
diff --git a/converter.yaml b/converter.yaml
index 824e8096b..2f3e422c0 100644
--- a/converter.yaml
+++ b/converter.yaml
@@ -1,7 +1,7 @@
 # the origin to fetch content from
 origin: https://author-p93411-e849602.adobeaemcloud.com
 suffix: ".html?wcmmode=disabled"
-internalHost: https://main--danaher-ls-aem--hlxsites.hlx.live
+internalHost: https://main--danaher-ls-aem--hlxsites.aem.live
 # the live urls of the content
 # this is used to make absolute links to the urls domain reliatve
 # it may be an array, if there are mutliple urls possible like
diff --git a/scripts/sidekick.js b/scripts/sidekick.js
index 09ef4dd2d..959b33645 100644
--- a/scripts/sidekick.js
+++ b/scripts/sidekick.js
@@ -1,5 +1,5 @@
 async function getContentSourceUrl(owner, repo, ref) {
-  const res = await fetch(`https://admin.hlx.page/sidekick/${owner}/${repo}/${ref}/env.json`);
+  const res = await fetch(`https://admin.aem.page/sidekick/${owner}/${repo}/${ref}/env.json`);
   if (!res || !res.ok) {
     return null;
   }
diff --git a/tools/actions/convert/src/index.js b/tools/actions/convert/src/index.js
index 049767f60..e737ebdac 100644
--- a/tools/actions/convert/src/index.js
+++ b/tools/actions/convert/src/index.js
@@ -183,7 +183,7 @@ async function rewriteLinksAndImages(state) {
 }
 
 function mapPathToFranklinDeliveryServlet(host, path) {
-  // host: https://ref--repo--owner.hlx.live
+  // host: https://ref--repo--owner.aem.live
   // mapped path: /bin/franklin.delivery/owner/repo/ref/path
   const [ref, repo, owner] = host.split('://')[1].split('.')[0].split('--');
   return `/bin/franklin.delivery/${owner}/${repo}/${ref}${path}`;