diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 5fed7abcd..cab28eda1 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Support question
-    url: http://docs.apiato.io/
+    url: http://apiato.io/
     about: 'This repository is only for reporting bugs. If you need help, get in touch with us via Slack.'
   - name: Documentation issue
     url: https://github.com/apiato/documentation
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8329f60fd..f0e4e4372 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-<!--- If you are unsure which branch your pull request should be sent to, please read: http://docs.apiato.io/miscellaneous/contribution/#Git-Branches -->
+<!--- If you are unsure which branch your pull request should be sent to, please read: http://apiato.io/docs/general/contribution-guide#git-branches -->
 
 ## Description
 <!--- Describe your changes in detail -->
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index f0bf23702..82e28d906 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -1,5 +1,5 @@
 # Support Questions
 
-For free community support visit our slack channel, you can find the link in the docs under [Get in touch with us](http://docs.apiato.io/).
+For free community support visit our slack channel, you can find the link in the docs under [Get in touch with us](http://apiato.io/docs/).
 
 For paid professional support, you can pick one of our [support packages](http://apiato.io/support.html).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c536e269..fb797680b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Thank you for your consideration
 
-Checkout out our [contribution guide](http://docs.apiato.io/miscellaneous/contribution/).
+Checkout out our [contribution guide](http://apiato.io/docs/general/contribution-guide).
diff --git a/README.md b/README.md
index a1d886fdb..1080d4cbc 100644
--- a/README.md
+++ b/README.md
@@ -56,12 +56,12 @@ Apiato gives you the core features of robust API's fully documented, for free; s
 > **Porto SAP** is a modern Software Architectural Pattern, designed to help developers organize their Code in a super maintainable way. It is very helpful for big and long term projects, as they tend to have higher complexity with time.
 
 It's completely **optional** to build your application using the Porto architecture.
-Alternatively, you can build it using the [MVC](http://docs.apiato.io/docs/getting-started/software-architectural-patterns#mvc-introduction) architecture, and still benefit from all the features of Apiato.
+Alternatively, you can build it using the [MVC](http://apiato.io/docs/getting-started/software-architectural-patterns#mvc-introduction) architecture, and still benefit from all the features of Apiato.
 
 <br>
 
 <p align="center">
-	<a href="http://docs.apiato.io/docs/">
+	<a href="http://apiato.io/docs/">
 	   <img src="https://github.com/apiato/documentation/blob/master/images/documentation-button.png" width=350px" alt="Apiato Docs"/>
 	</a>
 </p>
@@ -83,7 +83,7 @@ Alternatively, you can build it using the [MVC](http://docs.apiato.io/docs/getti
 
 Feel free to dive in! Fix open [Issues](https://github.com/apiato/apiato/issues/) and submit new [features](https://github.com/apiato/apiato/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc).
 <br>
-Make sure you check our [contribution guide](http://docs.apiato.io/docs/general/contribution-guide/) before getting started.
+Make sure you check our [contribution guide](http://apiato.io/docs/general/contribution-guide/) before getting started.
 <br>
 Apiato follows the [Contributor Covenant](https://www.contributor-covenant.org/version/1/4/code-of-conduct) Code of Conduct.
 
@@ -299,7 +299,7 @@ You can sponsor us using any of the methods below:
 <br>
 <b>2:</b> Email us at <a href = "mailto: support@apiato.io">support@apiato.io</a>.
 
-*Sponsors logos are displayed on the [github repository](https://github.com/apiato/apiato/) page and the [documentation website](http://docs.apiato.io/) home page.*
+*Sponsors logos are displayed on the [github repository](https://github.com/apiato/apiato/) page and the [documentation website](http://apiato.io/docs/) home page.*
 
 
 <a name="License"></a>