diff --git a/README.md b/README.md
index 03d056fba..c8c00e800 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Crafter Engine
 ==============
 
-Crafter Engine is the content rendering engine for CrafterCMS. For more information, please visit: http://docs.craftercms.org.
+Crafter Engine is the content rendering engine for CrafterCMS. For more information, please visit: http://craftercms.com/docs.
 
 # Community
 ## Contributors
diff --git a/src/main/api/engine-api.yaml b/src/main/api/engine-api.yaml
index 95b084b26..3d9799a70 100644
--- a/src/main/api/engine-api.yaml
+++ b/src/main/api/engine-api.yaml
@@ -4,7 +4,7 @@ servers:
 info:
   description: |-
     Crafter Engine API
-  version: '4.2.0'
+  version: '5.0.0'
   title: Crafter Engine
   termsOfService: ''
   contact:
@@ -14,7 +14,7 @@ info:
     url: 'https://www.gnu.org/licenses/gpl-3.0.en.html'
 externalDocs:
   description: CrafterCMS - Engine
-  url: 'https://docs.craftercms.org/current/reference/modules/engine/index.html'
+  url: 'https://craftercms.com/docs/current/reference/modules/engine/index.html'
 tags:
   - name: content
     description: Content retrieval operations
@@ -1152,7 +1152,7 @@ paths:
         - search
       summary: Search
       operationId: search
-      description: Performs a search operation in the OpenSearch index of the current site resolved for the request and optional other indexes. See <a class="reference external" href="https://docs.craftercms.org/current/reference/api/search.html#search-multi-index-query" rel="noopener noreferrer" target="_blank">Multi-index Query</a> for more information on performing a multiple index search. <br><br> <i>Note:</i> <br> <i>The request body must be a valid OpenSearch JSON query as described in the</i> <a class="reference external" href="https://opensearch.org/docs/latest/api-reference/search/" rel="noopener noreferrer" target="_blank">official docs</a>
+      description: Performs a search operation in the OpenSearch index of the current site resolved for the request and optional other indexes. See <a class="reference external" href="https://craftercms.com/docs/current/reference/api/search.html#search-multi-index-query" rel="noopener noreferrer" target="_blank">Multi-index Query</a> for more information on performing a multiple index search. <br><br> <i>Note:</i> <br> <i>The request body must be a valid OpenSearch JSON query as described in the</i> <a class="reference external" href="https://opensearch.org/docs/latest/api-reference/search/" rel="noopener noreferrer" target="_blank">official docs</a>
       parameters:
         - name: index
           in: query
diff --git a/src/main/webapp/default-site/templates/web/entry.ftl b/src/main/webapp/default-site/templates/web/entry.ftl
index aa0547eac..c71e40537 100644
--- a/src/main/webapp/default-site/templates/web/entry.ftl
+++ b/src/main/webapp/default-site/templates/web/entry.ftl
@@ -89,7 +89,7 @@
 
 <main id="main">
 
-	<a href="https://craftercms.org">
+	<a href="https://craftercms.com">
 		<img src="${urlTransformationService.transform('toWebAppRelativeUrl', '/static-assets/img/logo.svg')}" alt="CrafterCMS"/>
 	</a>
 
@@ -103,7 +103,7 @@
 	<nav class="navigation">
 		<h2 class="navigation--title">Helpful links:</h2>
 		<a class="navigation--link" href="/studio">Authoring environment</a>
-		<a class="navigation--link" href="http://docs.craftercms.org">Docs Homepage</a>
+		<a class="navigation--link" href="http://craftercms.com/docs">Docs Homepage</a>
 		<a class="navigation--link" href="http://www.craftercms.com/resources">Tutorials &amp; Screencasts</a>
 		<a class="navigation--link" href="http://www.craftercms.com/about/partners">Professional Services</a>
 	</nav>
diff --git a/src/main/webapp/default-site/templates/web/no-site.ftl b/src/main/webapp/default-site/templates/web/no-site.ftl
index 05a610cd6..d70414cdf 100644
--- a/src/main/webapp/default-site/templates/web/no-site.ftl
+++ b/src/main/webapp/default-site/templates/web/no-site.ftl
@@ -88,7 +88,7 @@
 
 <main id="main">
 
-	<a href="https://craftercms.org">
+	<a href="https://craftercms.com">
 		<img src="${urlTransformationService.transform('toWebAppRelativeUrl', '/static-assets/img/logo.svg')}" alt="CrafterCMS"/>
 	</a>
 
@@ -102,7 +102,7 @@
 	<nav class="navigation">
 		<h2 class="navigation--title">Helpful links:</h2>
 		<a class="navigation--link" href="/studio">Authoring environment</a>
-		<a class="navigation--link" href="http://docs.craftercms.org">Docs Homepage</a>
+		<a class="navigation--link" href="http://craftercms.com/docs">Docs Homepage</a>
 		<a class="navigation--link" href="http://www.craftercms.com/resources">Tutorials &amp; Screencasts</a>
 		<a class="navigation--link" href="http://www.craftercms.com/about/partners">Professional Services</a>
 	</nav>