diff --git a/Builds.md b/Builds.md
index 68ee18ef659..6c211fe571e 100644
--- a/Builds.md
+++ b/Builds.md
@@ -29,10 +29,10 @@ Check the Update Site and Drop dirs to contain the new Milestone or Release
     * Submit the pr
 
 1. Update and publish Release Notes (for Releases only)
-   * Create and review release notes (https://github.com/eclipse/xtext-website/tree/main/xtext-website/_posts/releasenotes and https://github.com/eclipse/xtext-website/tree/main/xtend-website/_posts/releasenotes)
+   * Create and review release notes (https://github.com/eclipse-xtext/xtext-website/tree/main/xtext-website/_posts/releasenotes and https://github.com/eclipse-xtext/xtext-website/tree/main/xtend-website/_posts/releasenotes)
    * For committer activity count `git shortlog -s -n -e v<PREV_RELEASE>..v<NEW_RELEASE>`
    * Remove published: false from release post
-   * [Create PR](https://github.com/eclipse/xtext-website/compare/published...main?expand=1) to merge branch main into published
+   * [Create PR](https://github.com/eclipse-xtext/xtext-website/compare/published...main?expand=1) to merge branch main into published
    * Merge the PR
    * Wait for the [website-deploy](https://ci.eclipse.org/xtext/job/releng/job/website-deploy/) to finish. Shortly after the new Release Notes should pop up on the [Xtext website](https://www.eclipse.org/Xtext/download.html) and the [Xtend website](https://www.eclipse.org/xtend/download.html).
 
diff --git a/NOTICE.md b/NOTICE.md
index b9f5d3d4d73..c46734d2aae 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -26,8 +26,8 @@ SPDX-License-Identifier: EPL-2.0
 
 The project maintains the following source code repositories:
 
-* https://github.com/eclipse/xtext
-* https://github.com/eclipse/xtext-website
+* https://github.com/eclipse-xtext/xtext
+* https://github.com/eclipse-xtext/xtext-website
 
 ## Third-party Content
 
diff --git a/dev-doc/Xtext-Maintenance-Manual.mm b/dev-doc/Xtext-Maintenance-Manual.mm
index 19205f56b39..5000b6deb3c 100644
--- a/dev-doc/Xtext-Maintenance-Manual.mm
+++ b/dev-doc/Xtext-Maintenance-Manual.mm
@@ -155,7 +155,7 @@
 <node TEXT="" ID="ID_591086714" CREATED="1611838862247" MODIFIED="1611839315301"/>
 </node>
 <node TEXT="Documentation" ID="ID_1775105458" CREATED="1611838713246" MODIFIED="1611838716112">
-<node TEXT="docs https://github.com/eclipse/xtext" ID="ID_516745645" CREATED="1611838933948" MODIFIED="1611838938373"/>
+<node TEXT="docs https://github.com/eclipse-xtext/xtext" ID="ID_516745645" CREATED="1611838933948" MODIFIED="1611838938373"/>
 </node>
 <node TEXT="Tools" ID="ID_1551928349" CREATED="1611838717596" MODIFIED="1611838720611">
 <node TEXT="MWE https://github.com/eclipse/mwe/" ID="ID_1921748167" CREATED="1611838792942" MODIFIED="1611838862069"/>
diff --git a/org.eclipse.xtend.maven.parent/pom.xml b/org.eclipse.xtend.maven.parent/pom.xml
index c0346627075..b6002a28098 100644
--- a/org.eclipse.xtend.maven.parent/pom.xml
+++ b/org.eclipse.xtend.maven.parent/pom.xml
@@ -13,16 +13,10 @@
 	<artifactId>org.eclipse.xtend.maven.parent</artifactId>
 	<packaging>pom</packaging>
 
-	<url>http://xtend-lang.org</url>
+	<url>https://eclipse.dev/Xtext/xtend/</url>
 	<name>Xtend Maven Plugin Parent POM</name>
 	<description>Xtend is a little language that compiles into idiomatic Java source code. You can use any existing Java library seamlessly from Xtend (and vice-versa). The compiled output is readable and pretty-printed, and tends to run as fast or faster than the equivalent handwritten Java code. It's the CoffeeScript for Java.</description>
 
-	<scm>
-		<connection>scm:git:https://github.com/eclipse/xtext-xtend.git</connection>
-		<developerConnection>scm:git:https://github.com/eclipse/xtext-xtend.git</developerConnection>
-		<url>https://github.com/eclipse/xtext-xtend.git</url>
-	</scm>
-
 	<properties>
 		<root-dir>${basedir}/..</root-dir>
 		<maven.version>3.6.0</maven.version>
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
index 2bfbfb1165f..f010d988e58 100644
--- a/org.eclipse.xtext.dev-bom/pom.xml
+++ b/org.eclipse.xtext.dev-bom/pom.xml
@@ -120,9 +120,9 @@
 		</developer>
 	</developers>
 	<scm>
-		<connection>scm:git:https://github.com/eclipse/xtext.git</connection>
-		<developerConnection>scm:git:https://github.com/eclipse/xtext.git</developerConnection>
-		<url>git@github.com:eclipse/xtext.git</url>
+		<connection>scm:git:https://github.com/eclipse-xtext/xtext.git</connection>
+		<developerConnection>scm:git:https://github.com/eclipse-xtext/xtext.git</developerConnection>
+		<url>git@github.com:eclipse-xtext/xtext.git</url>
 	</scm>
 	<properties>
 		<junit-platform-version>1.10.2</junit-platform-version>