diff --git a/_config.yml b/_config.yml
index 8b319202..e00eef80 100644
--- a/_config.yml
+++ b/_config.yml
@@ -8,7 +8,7 @@ description: >-
# Links
demo-link:
internal: demo.md
-doc-link: https://inventree.readthedocs.io/en/latest/
+doc-link: https://docs.inventree.org/en/latest/
deploy-link:
internal: deploy.md
blog-link:
diff --git a/_data/functions/extras.yml b/_data/functions/extras.yml
index 54a15ca5..d18d7c8c 100644
--- a/_data/functions/extras.yml
+++ b/_data/functions/extras.yml
@@ -1,10 +1,10 @@
functions:
- title: Build Parts
text: Inventree features a build management system to help you track the progress of your builds. Builds consume stock items to make new parts, you can decide to automatically or manually allocate parts from your current inventory.
- link: https://inventree.readthedocs.io/en/latest/part/part/
+ link: https://docs.inventree.org/en/latest/part/part/
- title: Report
text: Generate a wide range of reports using custom templates.
- link: https://inventree.readthedocs.io/en/latest/report/report/
+ link: https://docs.inventree.org/en/latest/report/report/
- title: Extend and Customize
text: InvenTree is designed to be highly extensible. If the core InvenTree functionality does not meet your particular need, InvenTree provides a RESTful API, a native Python library, and a powerful plugin system.
- link: https://inventree.readthedocs.io/en/latest/extend/api/
+ link: https://docs.inventree.org/en/latest/extend/api/
diff --git a/_data/functions/general.yml b/_data/functions/general.yml
index b7c00b9d..1bb93482 100644
--- a/_data/functions/general.yml
+++ b/_data/functions/general.yml
@@ -5,15 +5,15 @@ text:
functions:
- title: Organize Parts
text: Parts are the fundamental element of any inventory. InvenTree groups parts into structured categories which allow you to arrange parts to meet your particular needs.
- link: https://inventree.readthedocs.io/en/latest/part/part/
+ link: https://docs.inventree.org/en/latest/part/part/
- title: Manage Suppliers
text: InvenTree allows you to easily create, modify or delete suppliers and supplier items linked to any part in your inventory.
link: https://docs.inventree.org/en/latest/buy/supplier/
- title: Instant Stock Knowledge
text: Instantly view current stock for a certain part, in a particular location, or required for an individual build.
extend: Stock items are organized in cascading locations and sub-locations, allowing flexible inspection of stock under any location. Stock items can be serialized for tracking of individual items, and test results can be stored against a serialized stock item for the purpose of acceptance testing and commissioning.
- link: https://inventree.readthedocs.io/en/latest/stock/stock/
+ link: https://docs.inventree.org/en/latest/stock/stock/
- title: BOM Management
text: Intelligent Bill of Material management provides a clear understanding of the sub-parts required to make a new part.
extend: InvenTree allows you to upload simple BOM files in multiple formats, and download a detailed BOM with all the information stored in its database.
- link: https://inventree.readthedocs.io/en/latest/build/bom/
+ link: https://docs.inventree.org/en/latest/build/bom/
diff --git a/_news/2022-04-23-news-are-starting.md b/_news/2022-04-23-news-are-starting.md
index 2156a463..f98ace19 100644
--- a/_news/2022-04-23-news-are-starting.md
+++ b/_news/2022-04-23-news-are-starting.md
@@ -23,7 +23,7 @@ While the checks use the GitHub APIs, news are gathered from an **RSS-feed** tha
On your InvenTree instance the **background worker** loads the RSS-feed on a regular basis and creates **entries** for the news items and **notifications** for all applicable users.
### And my data?
-As listed above we are using GitHub pages for this feature. We are not introducing additional trackers to that so the [general InvenTree privacy statement](https://inventree.readthedocs.io/en/latest/privacy/) applies.
+As listed above we are using GitHub pages for this feature. We are not introducing additional trackers to that so the [general InvenTree privacy statement](https://docs.inventree.org/en/latest/privacy/) applies.
The short version: we **do not sell your data** or share it with third parties. We cannot guarantee what readthedocs and GitHub do with the metrics. We might use them as a metric for the stats section of the site. However, we get very little *actionable* information from that, a screenshot of the total info available is shown below.

diff --git a/_posts/2021-10-25-starting.md b/_posts/2021-10-25-starting.md
index 56ccb204..4f4e6b18 100644
--- a/_posts/2021-10-25-starting.md
+++ b/_posts/2021-10-25-starting.md
@@ -2,6 +2,6 @@
author: matmair
title: Starting with templates
---
-A good starting-point for developing your own plugin is taking a look at the [documentation](https://inventree.readthedocs.io/en/latest/extend/plugins/).
+A good starting-point for developing your own plugin is taking a look at the [documentation](https://docs.inventree.org/en/latest/extend/plugins/).
You could also use one of the current plugins as a sample.
\ No newline at end of file
diff --git a/deploy.md b/deploy.md
index d993d7ea..2c0dd7ae 100644
--- a/deploy.md
+++ b/deploy.md
@@ -5,17 +5,17 @@ title: Deploying InvenTree
There are multiple methods to deploy InvenTree. The most popular methods (supported by the development team) are:
### Installer
-We provide a [single-line installer](https://inventree.readthedocs.io/en/latest/start/installer/) that enables a quick installation and updates using the packager manager.
+We provide a [single-line installer](https://docs.inventree.org/en/latest/start/installer/) that enables a quick installation and updates using the packager manager.
### Docker
InvenTree supports a simple containerized installation via docker. An official [docker image](https://hub.docker.com/r/inventree/inventree/) is provided with regular updates.
-Refer to the [docker installation guide](https://inventree.readthedocs.io/en/latest/start/docker/) for more information
+Refer to the [docker installation guide](https://docs.inventree.org/en/latest/start/docker/) for more information
### Manual Bare Metal Install
-A [bare metal installation guide](https://inventree.readthedocs.io/en/latest/start/intro/) is provided for users who are looking for a low-level or custom installation.
+A [bare metal installation guide](https://docs.inventree.org/en/latest/start/intro/) is provided for users who are looking for a low-level or custom installation.
### Cloud
diff --git a/extend/api.md b/extend/api.md
index aad6f523..f07457f9 100644
--- a/extend/api.md
+++ b/extend/api.md
@@ -9,4 +9,4 @@ InvenTree ships with an extensive REST API that is used by several native applic
- InvenTree App (Android/iOS)
- python module
-The API is self-documenting. More information is provided in the [documentation](https://inventree.readthedocs.io/en/latest/api/api/).
+The API is self-documenting. More information is provided in the [documentation](https://docs.inventree.org/en/latest/api/api/).
diff --git a/extend/app.md b/extend/app.md
index 80ed77d9..242cb612 100644
--- a/extend/app.md
+++ b/extend/app.md
@@ -26,4 +26,4 @@ The InvenTree app can be downloaded from either the Android or Apple app stores,
### Documentation
-Mobile app documentation can be found on the [InvenTree documentation site](https://inventree.readthedocs.io/en/latest/app/app/).
\ No newline at end of file
+Mobile app documentation can be found on the [InvenTree documentation site](https://docs.inventree.org/en/latest/app/app/).
\ No newline at end of file
diff --git a/extend/index.md b/extend/index.md
index 75c7e20c..5e4f97db 100644
--- a/extend/index.md
+++ b/extend/index.md
@@ -8,4 +8,4 @@ InvenTree is designeds to be part of a larger system of tools to support both ho
- [API](api)
- [Integrate](integrate) into other tools
- PK2InvenTree for [migrating from PartKeepr to InvenTreen](https://github.com/rgilham/PK2InvenTree)
-- Python [package](https://inventree.readthedocs.io/en/latest/extend/python/)
+- Python [package](https://docs.inventree.org/en/latest/extend/python/)
diff --git a/extend/plugin/index.md b/extend/plugin/index.md
index ab0167ea..7e3e29a8 100644
--- a/extend/plugin/index.md
+++ b/extend/plugin/index.md
@@ -2,7 +2,7 @@
title: Plugins
---
We supply core-dev and community built plugins to get you started with extending InvenTree's functionality. Plugins can hook into many parts of the UI, buisness logic and webserver.
-We expose some internal python APIs to speed up your development and keep the instance running while you discover the possibilities. [Learn more](https://inventree.readthedocs.io/en/latest/extend/plugins/)
+We expose some internal python APIs to speed up your development and keep the instance running while you discover the possibilities. [Learn more](https://docs.inventree.org/en/latest/extend/plugins/)
### Highlights
diff --git a/support.md b/support.md
index 64589afc..6184a658 100644
--- a/support.md
+++ b/support.md
@@ -2,7 +2,7 @@
title: Get Support
---
-As an open source project we offer a [public issue tracker](https://github.com/inventree/InvenTree) and [public documentation](https://inventree.readthedocs.io).
+As an open source project we offer a [public issue tracker](https://github.com/inventree/InvenTree) and [public documentation](https://docs.inventree.org).
## General Questions
The core team answers questions in the issue tracker of in [discussions](https://github.com/inventree/InvenTree/discussions) when they find time.