diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 76e01006125..45f69d29e1c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,8 +13,8 @@ We eat our own ice cream so we use OpenProject for roadmap planning and team col
 - [Product roadmap](https://community.openproject.org/projects/openproject/work_packages?query_id=1993)
 - [Wish list](https://community.openproject.org/projects/openproject/work_packages?query_id=180)
 - [Bug backlog board](https://community.openproject.org/projects/openproject/boards/2905)
-- [Report a bug](https://docs.openproject.org/development/report-a-bug/)
-- [Submit a feature idea](https://docs.openproject.org/development/submit-feature-idea/)
+- [Report a bug](https://www.openproject.org/docs/development/report-a-bug/)
+- [Submit a feature idea](https://www.openproject.org/docs/development/submit-feature-idea/)
 
 
 ## Branching model
diff --git a/README.md b/README.md
index d70d8c40e1a..9f070129a21 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ OpenProject is a web-based project management software. Its key features are:
 * [Agile and Scrum](https://www.openproject.org/collaboration-software-features/#agile-scrum)
 * [Time tracking, cost reporting and budgeting](https://www.openproject.org/collaboration-software-features/#time-tracking)
 * [Bug tracking](https://www.openproject.org/collaboration-software-features/#bug-tracking)
-* [Wikis](https://docs.openproject.org/user-guide/wiki/)
-* [Forums](https://docs.openproject.org/user-guide/forums/)
-* [Meeting agendas and meeting minutes](https://docs.openproject.org/user-guide/meetings/)
+* [Wikis](https://www.openproject.org/docs/user-guide/wysiwyg/)
+* [Forums](https://www.openproject.org/docs/user-guide/forums/)
+* [Meeting agendas and meeting minutes](https://www.openproject.org/docs/user-guide/meetings/)
 
 More information and screenshots can be found on our [website](https://www.openproject.org).
 
@@ -25,7 +25,7 @@ in-depth [installation guides](https://www.openproject.org/download-and-installa
 
 ## Reporting bugs
 
-You found a bug? Please [report it](https://docs.openproject.org/development/report-a-bug) to our [OpenProject community](https://community.openproject.com/projects/openproject). Thank you!
+You found a bug? Please [report it](https://www.openproject.org/docs/development/report-a-bug/) to our [OpenProject community](https://community.openproject.com/projects/openproject). Thank you!
 
 ## Contribute
 
diff --git a/app/views/admin/settings/authentication_settings/show.html.erb b/app/views/admin/settings/authentication_settings/show.html.erb
index 2e0bda8dde6..14f1f767ccc 100644
--- a/app/views/admin/settings/authentication_settings/show.html.erb
+++ b/app/views/admin/settings/authentication_settings/show.html.erb
@@ -81,7 +81,7 @@ See COPYRIGHT and LICENSE files for more details.
         <div class="form--field -wide-label">
           <label><b><%= I18n.t :note %>: </b>
             <%=
-              url = 'https://docs.openproject.org/installation-and-operations/configuration/#disable-password-login'
+              url = 'https://www.openproject.org/docs/installation-and-operations/configuration/#disable-password-login'
 
               explanation = I18n.t :note_password_login_disabled,
                                    configuration: "<a target=\"_blank\" href=\"#{url}\"> #{I18n.t('label_configuration')}</a>"
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index 304d7e672f8..635813b3f32 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -1241,7 +1241,7 @@ en:
         no_roles_found: 'No roles were found'
         description: 'This is the role that %{principal} will receive when they join your project. The role defines which actions they are allowed to take and which information they are allowed to see.
             <a
-              href="https://docs.openproject.org/system-admin-guide/users-permissions/roles-permissions/#roles-and-permissions"
+              href="https://www.openproject.org/docs/system-admin-guide/users-permissions/roles-permissions/#roles-and-permissions"
               target="_blank">
               Learn more about roles and permissions.
             </a>'
diff --git a/docs/api/bcf/bcf-rest-api.md b/docs/api/bcf/bcf-rest-api.md
index baa35920c64..e90a527ad7f 100644
--- a/docs/api/bcf/bcf-rest-api.md
+++ b/docs/api/bcf/bcf-rest-api.md
@@ -99,7 +99,7 @@ The following OAuth2 flows are supported:
 The `clients_credentials` grant explicitly ruled out by the standard specification as not being user specific can be supported by OpenProject as the grant is mapped to a user account
 when configuring the OAuth access.
 
-Before a client is able to perform the flows, they need to be [configured in OpenProject](https://docs.openproject.org/system-admin-guide/authentication/oauth-applications/). `bcf_v2_1` needs
+Before a client is able to perform the flows, they need to be [configured in OpenProject](https://www.openproject.org/docs/system-admin-guide/authentication/oauth-applications/). `bcf_v2_1` needs
 to be checked for the scope. That value also needs to be provided for the scope property in OAuth requests.
 
 The OAuth2 flows alternatively proposed by the specification
diff --git a/docs/system-admin-guide/system-settings/general-settings/README.md b/docs/system-admin-guide/system-settings/general-settings/README.md
index 05c268f4467..5ea9bf5300d 100644
--- a/docs/system-admin-guide/system-settings/general-settings/README.md
+++ b/docs/system-admin-guide/system-settings/general-settings/README.md
@@ -34,7 +34,7 @@ You can configure general system settings in OpenProject. Under System settings
 
     *Note: if enabled, this will display a badge with your installation status in the* [Information](https://qa.openproject-edge.com/admin/info) *administration panel, and on the home page. It is displayed to administrators only.*
     
-    *The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit* [the configuration documentation](https://docs.openproject.org/system-admin-guide/information/#security-badge)*.*![image-20211209161629590](image-20211209161629590.png)
+    *The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit* [the configuration documentation](https://www.openproject.org/docs/system-admin-guide/information/#security-badge)*.*![image-20211209161629590](image-20211209161629590.png)
 
 ## Welcome block text
 
diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.ts
index 7f0ce692c66..6a346080ff8 100644
--- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.ts
+++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.ts
@@ -81,7 +81,7 @@ import { DynamicFormService } from '../../services/dynamic-form/dynamic-form.ser
 *
 * - initialPayload @Input:
 *   Allows to provide and initial payload to the form settings request. Checkout
-*   the [forms documentation](https://docs.openproject.org/api/forms/).
+*   the [forms documentation](https://www.openproject.org/docs/api/forms/).
 *
 * - model @Input:
 *   Allows to change model of the form.
diff --git a/lib/open_project/database.rb b/lib/open_project/database.rb
index a31228fc2b6..52a3126756d 100644
--- a/lib/open_project/database.rb
+++ b/lib/open_project/database.rb
@@ -113,7 +113,7 @@ module OpenProject
       elsif version_deprecated?
         message = "The next major release of OpenProject (v12) will require PostgreSQL 13 or later.\n" \
                   "You can anticipate this upgrade by updating your database installation by following the guide at " \
-                  "https://docs.openproject.org/installation-and-operations/misc/migration-to-postgresql13/"
+                  "https://www.openproject.org/docs/installation-and-operations/misc/migration-to-postgresql13/"
 
         raise DeprecatedVersionWarning.new message
       end
diff --git a/modules/github_integration/openproject-github_integration.gemspec b/modules/github_integration/openproject-github_integration.gemspec
index 047149e2982..cdee2777040 100644
--- a/modules/github_integration/openproject-github_integration.gemspec
+++ b/modules/github_integration/openproject-github_integration.gemspec
@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.version     = '1.0.0'
   s.authors     = "OpenProject GmbH"
   s.email       = "info@openproject.com"
-  s.homepage    = "https://docs.openproject.org/system-admin-guide/github-integration/"
+  s.homepage    = "https://www.openproject.org/docs/system-admin-guide/integrations/github-integration/"
   s.summary     = 'OpenProject Github Integration'
   s.description = 'Integrates OpenProject and Github for a better workflow'
   s.license     = 'GPLv3'
diff --git a/modules/overviews/config/locales/en.seeders.bim.yml b/modules/overviews/config/locales/en.seeders.bim.yml
index a25b54775ae..a9ad3645373 100644
--- a/modules/overviews/config/locales/en.seeders.bim.yml
+++ b/modules/overviews/config/locales/en.seeders.bim.yml
@@ -70,7 +70,7 @@ en:
                       6.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages](%{base_url}/projects/demo-construction-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
                       7.  _Agile working? Check out our brand new boards:_ → Go to [Boards](%{base_url}/projects/demo-construction-project/boards)
 
-                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
+                      Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
                       Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                 - identifier: 'project_status'
                   start_row: 2
@@ -140,7 +140,7 @@ en:
                       5.  _Activate further modules:_ → Go to [Project settings → Modules](%{base_url}/projects/demo-planning-constructing-project/settings/modules).
                       6.  _Working agile? Create a new board:_ → Go to [Boards](%{base_url}/projects/demo-planning-constructing-project/boards)
 
-                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
+                      Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
                       Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                 - identifier: 'project_status'
                   start_row: 2
@@ -213,7 +213,7 @@ en:
                       8.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages](%{base_url}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
                       9.  _Working agile? Create a new board:_ → Go to [Boards](%{base_url}/projects/demo-bim-project/boards)
 
-                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
+                      Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
                       Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                 - identifier: 'project_status'
                   start_row: 2
@@ -285,7 +285,7 @@ en:
                       7.  _Activate further modules:_ → Go to [Project settings → Modules.](%{base_url}/projects/demo-bcf-management-project/settings/modules)
                       8.  _You love the agile approach? Create a board:_ → Go to [Boards](%{base_url}/projects/demo-bcf-management-project/boards).
 
-                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
+                      Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
                       Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
                 - identifier: 'project_status'
                   start_row: 2
diff --git a/modules/overviews/config/locales/en.seeders.standard.yml b/modules/overviews/config/locales/en.seeders.standard.yml
index 7377d1b847a..721751efcd8 100644
--- a/modules/overviews/config/locales/en.seeders.standard.yml
+++ b/modules/overviews/config/locales/en.seeders.standard.yml
@@ -66,7 +66,7 @@ en:
                       5. *Activate further modules*: &rightarrow; Go to [Project settings &rightarrow; Modules](%{base_url}/projects/demo-project/settings/modules).
                       6. *Complete your tasks in the project*: &rightarrow; Go to [Work packages &rightarrow; Tasks](%{base_url}/projects/demo-project/work_packages/details/##wp.id:"Set date and location of conference"/overview?query_id=##query.id:"Tasks").
 
-                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
+                      Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
                       Please let us know if you have any questions or need support. Contact us: [support[at]openproject.com](mailto:support@openproject.com).
                 - identifier: 'project_status'
                   start_row: 2
@@ -137,7 +137,7 @@ en:
                       6. *Create a Sprint wiki*: &rightarrow; Go to [Backlogs](%{base_url}/projects/your-scrum-project/backlogs) and open the sprint wiki from the right drop down menu in a sprint. You can edit the [wiki template](%{base_url}/projects/your-scrum-project/wiki/) based on your needs.
                       7. *Activate further modules*: &rightarrow; Go to [Project settings &rightarrow; Modules](%{base_url}/projects/your-scrum-project/settings/modules).
 
-                      Here you will find our [User Guides](https://docs.openproject.org/user-guide/).
+                      Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
                       Please let us know if you have any questions or need support. Contact us: [support[at]openproject.com](mailto:support@openproject.com).
                 - identifier: 'project_status'
                   start_row: 2