diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
index 4c1b1c9c1e3..f5e96cf6729 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
@@ -26,7 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
index d67da8cbef5..309adeee08c 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
@@ -26,7 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
index 5db0d1d5c8c..2f3c9ee3e97 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
@@ -26,7 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
index 5c8f1474347..41cd62f3f1d 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
@@ -26,7 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
index 634467edb1a..56c78f30231 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
@@ -38,7 +38,7 @@
 			<unit id="org.opentest4j" version="1.2.0.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
index ebcbac8b30f..d5475769200 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
@@ -26,7 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
index bbceaf2d364..05eee5566cd 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
@@ -26,7 +26,7 @@
 			<unit id="org.junit" version="4.13.2.v20211018-1956"/>
 			<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 		</location>
 	</locations>
 </target>
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
index d1bb60e7ff4..395f9995b91 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
@@ -23,7 +23,7 @@
         Just mention the p2 repo so that additional requirements with ranges specified in
         features and bundles are taken from Orbit (e.g., objectweb.asm)
       -->
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
index e066e957e6e..39373cde190 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
@@ -107,7 +107,7 @@ class TargetPlatformProject extends ProjectDescriptor {
 					�ENDIF�
 					<unit id="org.objectweb.asm" version="9.4.0.v20221107-1714"/>
 					<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-					<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+					<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 				</location>
 			</locations>
 		</target>
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
index 54a2c30c1fa..dfd5d098292 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
@@ -248,7 +248,7 @@ public CharSequence target() {
     _builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.149.v20220915-0556\"/>");
     _builder.newLine();
     _builder.append("\t\t\t");
-    _builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/downloads/2023-03\"/>");
+    _builder.append("<repository location=\"https://download.eclipse.org/tools/orbit/downloads/2023-06\"/>");
     _builder.newLine();
     _builder.append("\t\t");
     _builder.append("</location>");
diff --git a/releng/org.eclipse.xtext.contributor/Xtext.setup b/releng/org.eclipse.xtext.contributor/Xtext.setup
index 686b310b47f..5df17abf302 100644
--- a/releng/org.eclipse.xtext.contributor/Xtext.setup
+++ b/releng/org.eclipse.xtext.contributor/Xtext.setup
@@ -94,7 +94,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="p2.orbit"
-      value="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+      value="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
   <setupTask
       xsi:type="setup:VariableTask"
       name="p2.mwe2"
diff --git a/xtext-latest.target b/xtext-latest.target
index 08222eebb5e..d709383018c 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -48,7 +48,7 @@
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
diff --git a/xtext-r202203.target b/xtext-r202203.target
index 20f3922008a..fc6dadc84e0 100644
--- a/xtext-r202203.target
+++ b/xtext-r202203.target
@@ -52,7 +52,7 @@
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
diff --git a/xtext-r202206.target b/xtext-r202206.target
index 64856fa3a1a..a36b51153e1 100644
--- a/xtext-r202206.target
+++ b/xtext-r202206.target
@@ -51,7 +51,7 @@
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
diff --git a/xtext-r202209.target b/xtext-r202209.target
index 48690a75333..e9d5ea7d9eb 100644
--- a/xtext-r202209.target
+++ b/xtext-r202209.target
@@ -49,7 +49,7 @@
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
diff --git a/xtext-r202212.target b/xtext-r202212.target
index 2f7b68c1110..3d02f61e8ce 100644
--- a/xtext-r202212.target
+++ b/xtext-r202212.target
@@ -44,7 +44,7 @@
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/2.6.0/" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
diff --git a/xtext-r202303.target b/xtext-r202303.target
index 9628a227153..2870291f9cf 100644
--- a/xtext-r202303.target
+++ b/xtext-r202303.target
@@ -45,7 +45,7 @@
 			<repository location="https://download.eclipse.org/technology/swtbot/releases/4.0.0/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-03"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>