diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b6ff532e2..82cf920cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,10 +20,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven
diff --git a/Jenkinsfile b/Jenkinsfile
index 6a5491c91..53fa76b54 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
     }
     stage('Build p2') {
       steps {
-        sh "mvn verify -Depp.p2.all -Depp.product.all --batch-mode --show-version -Dmaven.repo.local=.repository -Dtycho.disableP2Mirrors=true -Peclipse-sign-jar -Pepp.p2.aggregation"
+        sh "mvn verify -Depp.p2.all -Depp.product.all --batch-mode --show-version -Dmaven.repo.local=.repository -Declipse.p2.mirrors=false -Peclipse-sign-jar -Pepp.p2.aggregation"
         sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
           sh "scp -rpv releng/org.eclipse.epp.config/aggregation/target/repository/final/* ${SSHUSER}:${BUILDING}/repository/"
         }
diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 58edaec79..f4d25f621 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -57,9 +57,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF
index 569d7dc3c..7e56a4693 100644
--- a/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.epp.package.committers;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app,
  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/packages/org.eclipse.epp.package.common/.classpath b/packages/org.eclipse.epp.package.common/.classpath
index e801ebfb4..375961e4d 100644
--- a/packages/org.eclipse.epp.package.common/.classpath
+++ b/packages/org.eclipse.epp.package.common/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs b/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs
index 7adc0fb9a..1e0cb16bb 100644
--- a/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs
+++ b/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=21
diff --git a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
index f3f2e2fda..209966afd 100644
--- a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.eclipse.epp.package.common
 Bundle-Name: Common EPP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.common;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app,
  org.eclipse.ui,
diff --git a/packages/org.eclipse.epp.package.common/src/org/eclipse/epp/common/ContributeHandler.java b/packages/org.eclipse.epp.package.common/src/org/eclipse/epp/common/ContributeHandler.java
index 5cb778e66..ae2a55a64 100644
--- a/packages/org.eclipse.epp.package.common/src/org/eclipse/epp/common/ContributeHandler.java
+++ b/packages/org.eclipse.epp.package.common/src/org/eclipse/epp/common/ContributeHandler.java
@@ -8,7 +8,7 @@
 package org.eclipse.epp.common;
 
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -33,7 +33,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		}
 		try {
 			IWebBrowser browser = activeWorkbenchWindow.getWorkbench().getBrowserSupport().createBrowser(getClass().getName());
-			browser.openURL(new URL(CONTRIBUTE_URL));
+			browser.openURL(URI.create(CONTRIBUTE_URL).toURL());
 			return Status.OK_STATUS;
 		} catch (PartInitException e) {
 			Program.launch(CONTRIBUTE_URL);
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 738bf0f08..1ab34b03a 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -57,9 +57,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
index 6a6b5587b..20a19b50f 100644
--- a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP CPP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.cpp;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index 9daa0b07c..0198b998d 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -56,9 +56,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
index b6e64b97d..2b88a4749 100644
--- a/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP DSL Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.dsl;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index ee331eb76..d8eb594af 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -57,9 +57,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF
index 79543cd08..be6b68189 100644
--- a/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP Embedded CPP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.embedcpp;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index 6a58f830a..e8f20ad80 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -56,9 +56,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
index ee4a1198f..ad72142ba 100644
--- a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP Java Package
 Bundle-SymbolicName: org.eclipse.epp.package.java;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 059ab7a9f..edae54365 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -56,9 +56,9 @@
    <intro introId="org.eclipse.wtp.epp.package.jee.intro.intro"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
index f3867232c..a6ce65227 100644
--- a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.epp.package.jee;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 39ec5e98e..4c69e92d7 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -57,9 +57,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
index e50b4de80..701481421 100644
--- a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP Modeling Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.modeling;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app,
  org.eclipse.ui.intro.quicklinks;bundle-version="1.0.0"
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 145d5d018..c4459be65 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -57,9 +57,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
index 18736f20e..6e4486d18 100644
--- a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP PHP Package
 Bundle-SymbolicName: org.eclipse.epp.package.php;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app,
  org.eclipse.ui.workbench
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 54b0103a4..72b2eaf7f 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -56,9 +56,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
index 6b3161147..dda930742 100644
--- a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: EPP RCP/RAP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.rcp;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index 9ee38eaae..d18c3b73b 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -19,7 +19,7 @@
 --launcher.defaultAction openFile
 --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=17
+      <vmArgs>-Dosgi.requiredJavaVersion=21
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
 -Dosgi.dataAreaRequiresExplicitInit=true
 -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
@@ -57,9 +57,9 @@
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21</windows>
    </vm>
 
    <configurations>
diff --git a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
index d1aee58eb..a48d6bc6f 100644
--- a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.epp.package.scout;singleton:=true
 Bundle-Version: 4.32.0.qualifier
 Bundle-Vendor: %pluginVendor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir
diff --git a/releng/org.eclipse.epp.config/aggregation/pom.xml b/releng/org.eclipse.epp.config/aggregation/pom.xml
index e3242e8ca..0eb2ee573 100644
--- a/releng/org.eclipse.epp.config/aggregation/pom.xml
+++ b/releng/org.eclipse.epp.config/aggregation/pom.xml
@@ -23,8 +23,7 @@
 
   <properties>
     <simrel.aggregator.repo.url.relative>nightly/latest</simrel.aggregator.repo.url.relative>
-    <simrel.aggregator.repo.url>
-      https://download.eclipse.org/cbi/updates/p2-aggregator/products/${simrel.aggregator.repo.url.relative}</simrel.aggregator.repo.url>
+    <simrel.aggregator.repo.url>https://download.eclipse.org/cbi/updates/p2-aggregator/products/${simrel.aggregator.repo.url.relative}</simrel.aggregator.repo.url>
     <simrel.aggregator.build.type>CLEAN_BUILD</simrel.aggregator.build.type>
   </properties>
 
@@ -44,15 +43,12 @@
             <configuration>
               <applicationsArgs>
                 <applicationsArg>-application</applicationsArg>
-                <applicationsArg>
-                  org.eclipse.cbi.p2repo.cli.headless</applicationsArg>
+                <applicationsArg>org.eclipse.cbi.p2repo.cli.headless</applicationsArg>
                 <applicationsArg>aggregate</applicationsArg>
                 <applicationsArg>--buildModel</applicationsArg>
-                <applicationsArg>
-                  ${project.basedir}/packaging.aggr</applicationsArg>
+                <applicationsArg>${project.basedir}/packaging.aggr</applicationsArg>
                 <applicationsArg>--buildRoot</applicationsArg>
-                <applicationsArg>
-                  ${project.build.directory}/repository</applicationsArg>
+                <applicationsArg>${project.build.directory}/repository</applicationsArg>
                 <applicationsArg>--eclipseLogLevel</applicationsArg>
                 <applicationsArg>INFO</applicationsArg>
                 <applicationsArg>--logLevel</applicationsArg>
@@ -60,19 +56,15 @@
                 <applicationsArg>--action</applicationsArg>
                 <applicationsArg>${simrel.aggregator.build.type}</applicationsArg>
               </applicationsArgs>
-              <executionEnvironment>JavaSE-17</executionEnvironment>
+              <executionEnvironment>JavaSE-21</executionEnvironment>
               <jvmArgs>
                 <jvmArg>-Xms256M</jvmArg>
                 <jvmArg>-Xmx2048M</jvmArg>
                 <jvmArg>-Duser.home=${project.build.directory}</jvmArg>
-                <jvmArg>
-                  -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclientjava</jvmArg>
-                <jvmArg>
-                  -Dpackages.clone.location.uri=${project.baseUri}/../../..</jvmArg>
-                <jvmArg>
-                  -Dsimrel.uri=${eclipse.simultaneous.release.repository}</jvmArg>
-                <jvmArg>
-                  -Djustj.jres.uri=${justj.jres.repository}</jvmArg>
+                <jvmArg>-Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclientjava</jvmArg>
+                <jvmArg>-Dpackages.clone.location.uri=${project.baseUri}/../../..</jvmArg>
+                <jvmArg>-Dsimrel.uri=${eclipse.simultaneous.release.repository}</jvmArg>
+                <jvmArg>-Djustj.jres.uri=${justj.jres.repository}</jvmArg>
                 <jvmArg>-Djustj.epp.uri=${justj.epp.repository}</jvmArg>
               </jvmArgs>
               <repositories>
@@ -84,13 +76,11 @@
               </repositories>
               <dependencies>
                 <dependency>
-                  <artifactId>
-                    org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group</artifactId>
+                  <artifactId>org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group</artifactId>
                   <type>p2-installable-unit</type>
                 </dependency>
                 <dependency>
-                  <artifactId>
-                    org.eclipse.equinox.p2.core.feature</artifactId>
+                  <artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
                   <type>eclipse-feature</type>
                 </dependency>
                 <dependency>
diff --git a/releng/org.eclipse.epp.config/oomph/EPP.setup b/releng/org.eclipse.epp.config/oomph/EPP.setup
index fcc4db0ad..0942c1c35 100644
--- a/releng/org.eclipse.epp.config/oomph/EPP.setup
+++ b/releng/org.eclipse.epp.config/oomph/EPP.setup
@@ -21,8 +21,8 @@
   </annotation>
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-17"
-      location="${jre.location-17}">
+      version="JavaSE-21"
+      location="${jre.location-21}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -94,7 +94,7 @@
         <repository
             url="https://download.eclipse.org/justj/epp/milestone/latest"/>
         <repository
-            url="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
+            url="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
       </repositoryList>
     </targlet>
   </setupTask>
@@ -268,7 +268,7 @@
   <setupTask
       xsi:type="setup:StringSubstitutionTask"
       name="justj.jres.uri"
-      value="https://download.eclipse.org/justj/jres/17/updates/release/latest">
+      value="https://download.eclipse.org/justj/jres/21/updates/release/latest">
     <description>The JustJ JRE p2 repository used to build the packages as used in packaging.aggr</description>
   </setupTask>
   <setupTask
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 5646c9c0b..4643a5bf1 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -53,7 +53,7 @@
     <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
     <eclipse.simultaneous.release.repository>${SIMREL_REPO}</eclipse.simultaneous.release.repository>
     <!-- Used for the variable below to update easily, e.g., to 21. -->
-    <execution.environment.version>17</execution.environment.version>
+    <execution.environment.version>21</execution.environment.version>
     <!-- Used for the JustJ JREs p2 repository. -->
     <justj.jres.repository>https://download.eclipse.org/justj/jres/${execution.environment.version}/updates/release/latest</justj.jres.repository> <!-- Keep URL in sync with Oomph setup-->
     <!-- Used for the JustJ EPP p2 repository. -->
diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.sh b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
index c3dc76304..ac4acff97 100755
--- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh
+++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
@@ -24,7 +24,7 @@ RELEASE_MILESTONE=$(get_property RELEASE_MILESTONE)
 RELEASE_DIR=$(get_property RELEASE_DIR)
 SIMREL_REPO=$(get_property SIMREL_REPO)
 EPP_DOWNLOADS=/home/data/httpd/download.eclipse.org/technology/epp
-DOWNLOADS=${EPP_DOWNLOADS}/downloads/release/${RELEASE_NAME}/
+DOWNLOADS=${EPP_DOWNLOADS}/downloads/release/${RELEASE_NAME}
 REPO=${EPP_DOWNLOADS}/packages/${RELEASE_NAME}/
 
 SSHUSER="genie.packaging@projects-storage.eclipse.org"