diff --git a/pom.xml b/pom.xml
index b5287f72d..47a57c7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
 	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>2025-06</id>
+			<id>2025-09</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -139,7 +139,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2025-06</artifactId>
+									<artifactId>platform-definition-2025-09</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -149,28 +149,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2025-03</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<version>${tycho.version}</version>
-						<configuration>
-							<target>
-								<artifact>
-									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2025-03</artifactId>
-									<version>${revision}${changelist}</version>
-								</artifact>
-							</target>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>2024-12</id>
+			<id>2025-06</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -181,7 +160,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2024-12</artifactId>
+									<artifactId>platform-definition-2025-06</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -191,7 +170,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2024-09</id>
+			<id>2025-03</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -202,7 +181,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2024-09</artifactId>
+									<artifactId>platform-definition-2025-03</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -212,7 +191,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2024-06</id>
+			<id>2024-12</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -223,7 +202,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2024-06</artifactId>
+									<artifactId>platform-definition-2024-12</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
diff --git a/releng/platform-definitions/platform-definition-2024-06/platform-definition-2024-06.target b/releng/platform-definitions/platform-definition-2024-06/platform-definition-2024-06.target
deleted file mode 100644
index b54e92913..000000000
--- a/releng/platform-definitions/platform-definition-2024-06/platform-definition-2024-06.target
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-   Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
-
-   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-   The contents of this file are subject to the terms of either the Universal Permissive License
-   v 1.0 as shown at https://oss.oracle.com/licenses/upl
-
-   or the following license:
-
-   Redistribution and use in source and binary forms, with or without modification, are permitted
-   provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list of conditions
-   and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice, this list of
-   conditions and the following disclaimer in the documentation and/or other materials provided with
-   the distribution.
-
-   3. Neither the name of the copyright holder nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<?pde version="3.8"?>
-<target name="jmc-target-2024-06" sequenceNumber="47">
-    <locations>
-        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
-            <unit id="angus-activation" version="2.0.2"/>
-            <unit id="org.owasp.encoder" version="1.2.3"/>
-            <unit id="lz4-java" version="1.8.0"/>
-            <unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
-            <unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
-            <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
-            <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
-            <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.jolokia.client-jmx-adapter.standalone" version="2.0.2"/>
-            <unit id="org.jolokia.service.discovery" version="2.0.2"/>
-            <unit id="org.jolokia.server.core" version="2.0.2"/>
-            <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
-            <unit id="jakarta.annotation-api" version="3.0.0"/>
-            <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
-            <unit id="fireplace-swing" version="0.0.1.rc9"/>
-            <unit id="fireplace-swt-awt-bridge" version="0.0.1.rc9"/>
-            <unit id="fireplace-swing-animation" version="0.0.1.rc9"/>
-            <unit id="radiance-animation" version="7.5.0"/>
-            <unit id="org.awaitility" version="4.0.0"/>
-            <repository location="http://localhost:8080/site"/>
-        </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2500.v20240513-1750"/>
-            <unit id="org.eclipse.pde.feature.group" version="3.15.400.v20240601-0610"/>
-            <unit id="jakarta.servlet-api" version="6.0.0"/>
-            <unit id="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.6.300.v20240515-1919"/>
-            <unit id="org.eclipse.equinox.p2.updatechecker" version="1.4.300.v20240514-1422"/>
-            <unit id="org.eclipse.update.configurator" version="3.5.400.v20240416-0654"/>
-            <unit id="org.eclipse.equinox.p2.reconciler.dropins" version="1.5.400.v20240321-1450"/>
-            <unit id="org.eclipse.help.webapp" version="3.11.400.v20240508-1954"/>
-            <unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
-            <unit id="org.eclipse.rcp.feature.group" version="4.32.0.v20240601-0610"/>
-            <unit id="org.eclipse.help.feature.group" version="2.3.1800.v20240601-0610"/>
-            <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2400.v20240515-1919"/>
-            <unit id="org.eclipse.ui.net" version="1.5.400.v20240413-1529"/>
-            <unit id="org.eclipse.equinox.p2.director.app" version="1.3.400.v20240425-1316"/>
-            <unit id="org.eclipse.ui.themes" version="1.2.2400.v20240213-1133"/>
-            <unit id="org.eclipse.sdk" version="4.32.0.v20240601-0610"/>
-            <unit id="org.eclipse.osgi.services" version="3.12.100.v20240327-0645"/>
-            <repository location="https://download.eclipse.org/releases/2024-06/" />
-        </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.26.0.v20230220105658"/>
-            <unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.26.0.v20230220105658"/>
-            <!-- No new release yet - using 2022-12 -->
-            <repository location="https://archive.eclipse.org/technology/babel/update-site/R0.20.0/2022-12/"/>
-        </location>
-    </locations>
-    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
-</target>
diff --git a/releng/platform-definitions/platform-definition-2024-09/pom.xml b/releng/platform-definitions/platform-definition-2024-09/pom.xml
deleted file mode 100644
index 30fceb956..000000000
--- a/releng/platform-definitions/platform-definition-2024-09/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
-
-   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-   The contents of this file are subject to the terms of either the Universal Permissive License
-   v 1.0 as shown at https://oss.oracle.com/licenses/upl
-
-   or the following license:
-
-   Redistribution and use in source and binary forms, with or without modification, are permitted
-   provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list of conditions
-   and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice, this list of
-   conditions and the following disclaimer in the documentation and/or other materials provided with
-   the distribution.
-
-   3. Neither the name of the copyright holder nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.openjdk.jmc</groupId>
-		<artifactId>platform-definitions</artifactId>
-		<version>${revision}${changelist}</version>
-	</parent>
-	<artifactId>platform-definition-2024-09</artifactId>
-	<packaging>eclipse-target-definition</packaging>
-	<properties>
-		<jmc.config.path>${project.basedir}/../../../configuration</jmc.config.path>
-	</properties>
-</project>
diff --git a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target b/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
index 292202fae..a5d2cd883 100644
--- a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
+++ b/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
@@ -49,15 +49,15 @@
             <unit id="org.jolokia.service.discovery" version="2.0.2"/>
             <unit id="org.jolokia.server.core" version="2.0.2"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
             <unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
diff --git a/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target b/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
index 9e2137a3b..2f19bc93e 100644
--- a/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
+++ b/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
@@ -49,15 +49,15 @@
             <unit id="org.jolokia.service.discovery" version="2.0.2"/>
             <unit id="org.jolokia.server.core" version="2.0.2"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
             <unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
diff --git a/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target b/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
index 758fad7fc..36b291839 100644
--- a/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
+++ b/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
@@ -49,15 +49,15 @@
             <unit id="org.jolokia.service.discovery" version="2.0.2"/>
             <unit id="org.jolokia.server.core" version="2.0.2"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
             <unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
diff --git a/releng/platform-definitions/platform-definition-2024-09/platform-definition-2024-09.target b/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
similarity index 84%
rename from releng/platform-definitions/platform-definition-2024-09/platform-definition-2024-09.target
rename to releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
index 4e8114699..5cc580c48 100644
--- a/releng/platform-definitions/platform-definition-2024-09/platform-definition-2024-09.target
+++ b/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-   Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
+   Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2025, Datadog, Inc. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -33,7 +33,7 @@
    WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <?pde version="3.8"?>
-<target name="jmc-target-2024-09" sequenceNumber="47">
+<target name="jmc-target-2025-09" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.angus.jakarta.mail" version="2.0.3"/>
@@ -49,15 +49,15 @@
             <unit id="org.jolokia.service.discovery" version="2.0.2"/>
             <unit id="org.jolokia.server.core" version="2.0.2"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
-            <unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
+            <unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
             <unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
@@ -69,24 +69,24 @@
             <repository location="http://localhost:8080/site"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2600.v20240722-2106"/>
-            <unit id="org.eclipse.pde.feature.group" version="3.16.0.v20240903-0240"/>
+            <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.3000.v20250801-0854"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.16.400.v20250905-0730"/>
             <unit id="jakarta.servlet-api" version="6.1.0"/>
-            <unit id="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.6.300.v20240515-1919"/>
-            <unit id="org.eclipse.equinox.p2.updatechecker" version="1.4.300.v20240514-1422"/>
-            <unit id="org.eclipse.update.configurator" version="3.5.400.v20240416-0654"/>
-            <unit id="org.eclipse.equinox.p2.reconciler.dropins" version="1.5.400.v20240321-1450"/>
-            <unit id="org.eclipse.help.webapp" version="3.11.500.v20240606-0803"/>
+            <unit id="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.6.500.v20250520-0551"/>
+            <unit id="org.eclipse.equinox.p2.updatechecker" version="1.4.600.v20250728-0401"/>
+            <unit id="org.eclipse.update.configurator" version="3.5.800.v20250625-0537"/>
+            <unit id="org.eclipse.equinox.p2.reconciler.dropins" version="1.5.700.v20250623-0536"/>
+            <unit id="org.eclipse.help.webapp" version="3.12.200.v20250710-0643"/>
             <unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
-            <unit id="org.eclipse.rcp.feature.group" version="4.33.0.v20240903-0618"/>
-            <unit id="org.eclipse.help.feature.group" version="2.3.1900.v20240903-0240"/>
-            <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2500.v20240801-1024"/>
-            <unit id="org.eclipse.ui.net" version="1.5.400.v20240413-1529"/>
-            <unit id="org.eclipse.equinox.p2.director.app" version="1.3.400.v20240425-1316"/>
-            <unit id="org.eclipse.ui.themes" version="1.2.2500.v20240819-1245"/>
-            <unit id="org.eclipse.sdk" version="4.33.0.v20240903-0240"/>
-            <unit id="org.eclipse.osgi.services" version="3.12.100.v20240327-0645"/>
-            <repository location="https://download.eclipse.org/releases/2024-09/" />
+            <unit id="org.eclipse.rcp.feature.group" version="4.37.0.v20250905-0730"/>
+            <unit id="org.eclipse.help.feature.group" version="2.3.2300.v20250905-0730"/>
+            <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2900.v20250729-0655"/>
+            <unit id="org.eclipse.ui.net" version="1.5.500.v20250611-0855"/>
+            <unit id="org.eclipse.equinox.p2.director.app" version="1.3.800.v20250720-1057"/>
+            <unit id="org.eclipse.ui.themes" version="1.2.2900.v20250806-1940"/>
+            <unit id="org.eclipse.sdk" version="4.37.0.v20250905-0730"/>
+            <unit id="org.eclipse.osgi.services" version="3.12.300.v20250707-1221"/>
+            <repository location="https://download.eclipse.org/releases/2025-09/" />
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.26.0.v20230220105658"/>
diff --git a/releng/platform-definitions/platform-definition-2024-06/pom.xml b/releng/platform-definitions/platform-definition-2025-09/pom.xml
similarity index 92%
rename from releng/platform-definitions/platform-definition-2024-06/pom.xml
rename to releng/platform-definitions/platform-definition-2025-09/pom.xml
index fd7fe4702..3f4ff54c0 100644
--- a/releng/platform-definitions/platform-definition-2024-06/pom.xml
+++ b/releng/platform-definitions/platform-definition-2025-09/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2024, 2025, Datadog, Inc. All rights reserved.
+   Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2025, Datadog, Inc. All rights reserved.
 
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
@@ -39,7 +39,7 @@
 		<artifactId>platform-definitions</artifactId>
 		<version>${revision}${changelist}</version>
 	</parent>
-	<artifactId>platform-definition-2024-06</artifactId>
+	<artifactId>platform-definition-2025-09</artifactId>
 	<packaging>eclipse-target-definition</packaging>
 	<properties>
 		<jmc.config.path>${project.basedir}/../../../configuration</jmc.config.path>
diff --git a/releng/platform-definitions/pom.xml b/releng/platform-definitions/pom.xml
index 99c066d30..4999b428b 100644
--- a/releng/platform-definitions/pom.xml
+++ b/releng/platform-definitions/pom.xml
@@ -44,10 +44,9 @@
 		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<modules>
+		<module>platform-definition-2025-09</module>
 		<module>platform-definition-2025-06</module>
 		<module>platform-definition-2025-03</module>
 		<module>platform-definition-2024-12</module>
-		<module>platform-definition-2024-09</module>
-		<module>platform-definition-2024-06</module>
 	</modules>
 </project>
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
index 8cdaae2bf..fed65a8cd 100644
--- a/releng/third-party/pom.xml
+++ b/releng/third-party/pom.xml
@@ -59,7 +59,7 @@
 		<lz4.version>1.8.0</lz4.version>
 		<hdrhistogram.version>2.2.2</hdrhistogram.version>
 		<jemmy.version>2.0.0</jemmy.version>
-		<jetty.version>12.0.21</jetty.version>
+		<jetty.version>12.1.0</jetty.version>
 		<spifly.version>1.3.7</spifly.version>
 		<jolokia.version>2.0.2</jolokia.version>
 		<wiremock.version>2.27.2</wiremock.version>