diff --git a/Jenkinsfile b/Jenkinsfile
index ec455e64e..7f325e723 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
   parameters {
     // see https://wiki.eclipse.org/Jenkins#JDK
     choice(name: 'JDK_VERSION', description: 'Which JDK should be used?', choices: [
-       'temurin-jdk11-latest', 'temurin-jdk17-latest'
+       'temurin-jdk8-latest', 'temurin-jdk11-latest', 'temurin-jdk17-latest'
     ])
     booleanParam(
       name: 'TRIGGER_DOWNSTREAM_BUILD', 
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java
index edfdd1671..330cd5268 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java
@@ -29,8 +29,6 @@ public class JavaVersionTest {
 	
 	@Test
 	public void testFromQualifier() {
-		assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("17"));
-		assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("1.17"));
 		assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("11"));
 		assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("1.11"));
 		assertEquals(JavaVersion.JAVA10, JavaVersion.fromQualifier("10"));
@@ -51,7 +49,6 @@ public class JavaVersionTest {
 	
 	@Test
 	public void test_getQualifier() {
-		assertEquals("17", JavaVersion.JAVA17.getQualifier());
 		assertEquals("11", JavaVersion.JAVA11.getQualifier());
 		assertEquals("10", JavaVersion.JAVA10.getQualifier());
 		assertEquals("9", JavaVersion.JAVA9.getQualifier());
@@ -68,8 +65,6 @@ public class JavaVersionTest {
 
 	@Test
 	public void test_toJdtClassFileConstant () {
-		assertEquals(3997696, JavaVersion.JAVA17.toJdtClassFileConstant());
-		assertEquals(3604480, JavaVersion.JAVA11.toJdtClassFileConstant());
 		assertEquals(3538944, JavaVersion.JAVA10.toJdtClassFileConstant());
 		assertEquals(3473408, JavaVersion.JAVA9.toJdtClassFileConstant());
 		assertEquals(3407872, JavaVersion.JAVA8.toJdtClassFileConstant());
diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java
index c62e1e67c..48c6099c9 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java
@@ -53,11 +53,7 @@ public enum JavaVersion {
 	/**
 	 * Well, Java 11
 	 */
-	JAVA11("Java 11", new String[] {"11", "1.11"}, "JavaSE-11", "-1.11", Constants.JAVA11),
-	/**
-	 * Well, Java 17, next LTS version
-	 */
-	JAVA17("Java 17", new String[] {"17", "1.17"}, "JavaSE-17", "-1.17", Constants.JAVA17)
+	JAVA11("Java 11", new String[] {"11", "1.11"}, "JavaSE-11", "-1.11", Constants.JAVA11)
 	;
 
 	private static final class Constants {
@@ -70,7 +66,6 @@ public enum JavaVersion {
 		private static final long JAVA9 = ((long)(MAJOR_VERSION_1_5 + 4) << 16) + MINOR_VERSION_0;
 		private static final long JAVA10 = ((long)(MAJOR_VERSION_1_5 + 5) << 16) + MINOR_VERSION_0;
 		private static final long JAVA11 = ((long)(MAJOR_VERSION_1_5 + 6) << 16) + MINOR_VERSION_0;
-		private static final long JAVA17 = ((long)(MAJOR_VERSION_1_5 + 12) << 16) + MINOR_VERSION_0;
 	}
 
 	//	 if you introduce a new JavaVersion don't forget to adapt
diff --git a/releng/pom.xml b/releng/pom.xml
index c3abd35b0..998e7fd46 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -12,7 +12,7 @@
 		<tycho-version>1.7.0</tycho-version>
 		<root-dir>${basedir}/..</root-dir>
 		<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
-		<upstreamBranch>cd_platformUpdateExp</upstreamBranch>
+		<upstreamBranch>master</upstreamBranch>
 	</properties>
 
 	<repositories>