diff --git a/SECURITY.md b/SECURITY.md
index c3d6ca9f6c..d1d5417cdf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,7 +11,7 @@ Automated tests and manual code reviews ensure that these contributions are safe
 
 We provide a mailing list for security advisories on OpenProject at <https://groups.google.com/forum/#!forum/openproject-security>. Please register there to get immediate notifications as we publish them. No messages except for security advisories or security related announcements will be sent there.
 
-Any security related information will also be published on our blog and website at https://www.openproject.com
+Any security related information will also be published on our blog and website at https://www.openproject.org
 
 To join this mailing list, please use the UI if you have a google account. If you don't, you can send an empty email to [openproject-security+subscribe@googlegroups.com](mailto:openproject-security+subscribe@googlegroups.com). You will get a join request, which you again have to reply with any content.
 
diff --git a/docs/api/apiv3/openapi-spec.yml b/docs/api/apiv3/openapi-spec.yml
index 2d0426f772..bed56139da 100644
--- a/docs/api/apiv3/openapi-spec.yml
+++ b/docs/api/apiv3/openapi-spec.yml
@@ -8,7 +8,7 @@ info:
     ## Introduction
 
     The documentation for the APIv3 is written according to the [OpenAPI 3.0 Specification](https://swagger.io/specification/).
-    You can either view the static version of this documentation on the [website](https://www.openproject.com/docs/api/introduction/)
+    You can either view the static version of this documentation on the [website](https://www.openproject.org/docs/api/introduction/)
     or the interactive Swagger UI version in your OpenProject installation under `/api/docs`.
     In the latter you can try out the various API endpoints directly interacting with our OpenProject data.
     Moreover you can access the specification source itself under `/api/v3/spec.json` and `/api/v3/spec.yml`
diff --git a/docs/development/security/README.md b/docs/development/security/README.md
index 76c7965e87..b67d4d988c 100644
--- a/docs/development/security/README.md
+++ b/docs/development/security/README.md
@@ -12,7 +12,7 @@ For more information on security and data privacy for OpenProject, please visit:
 
 We provide a mailing list for security advisories on OpenProject at [groups.google.com/g/openproject-security](https://groups.google.com/g/openproject-security). Please register there to get immediate notifications as we publish them. No messages except for security advisories or security related announcements will be sent there.
 
-Any security related information will also be published on our [blog and website](https://www.openproject.com)
+Any security related information will also be published on our [blog and website](https://www.openproject.org)
 
 To join this mailing list, please use the UI if you have a google account. If you don't, you can send an empty email to [openproject-security+subscribe@googlegroups.com](mailto:openproject-security+subscribe@googlegroups.com). You will get a join request, which you again have to reply with any content.
 
diff --git a/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts b/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts
index 32549ac389..1dd0b68e13 100644
--- a/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts
+++ b/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts
@@ -33,7 +33,7 @@ import { EnterpriseTrialData, EnterpriseTrialService } from 'core-app/features/e
 import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
 import { localizeLink } from 'core-app/shared/helpers/i18n/localized-link';
 
-const newsletterURL = 'https://www.openproject.com/newsletter/';
+const newsletterURL = 'https://www.openproject.org/newsletter/';
 
 @Component({
   selector: 'enterprise-trial-form',
@@ -58,7 +58,7 @@ export class EETrialFormComponent {
   public text = {
     general_consent: this.I18n.t('js.admin.enterprise.trial.form.general_consent', {
       link_terms: localizeLink({
-        en: 'https://www.openproject.com/terms-of-service/',
+        en: 'https://www.openproject.org/terms-of-service/',
         de: 'https://www.openproject.org/de/nutzungsbedingungen/',
       }),
       link_privacy: localizeLink({