diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index daa82460e10..b5996779730 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,10 +16,12 @@ jobs:
         os: ['ubuntu-22.04', 'macos-14', 'windows-2022']
         java: [ 21 ]
         additional-maven-args: ['']
+        additional-label: ['']
         include:
         - os: ubuntu-22.04
           java: 21
           additional-maven-args: -Pstrict-jdk-21
+          additional-label: -strict
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -37,7 +39,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ matrix.java }}-${{ hashFiles('**/pom.xml', '**/*.target') }}
+          key: ${{ runner.os }}-m2-${{ matrix.java }}${{ matrix.additional-label }}-${{ hashFiles('**/pom.xml', '**/*.target') }}
 
       - name: Set Maven Home environment variable
         run: echo "MAVEN_WRAPPER_HOME=$(./mvnw --version | grep "Maven home:" | cut -c 13-)" >> "$GITHUB_ENV"
@@ -61,13 +63,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results-${{ runner.os }}-${{ matrix.java }}
+          name: test-results-${{ runner.os }}-${{ matrix.java }}${{ matrix.additional-label }}
           path: '**/*.tests/target/surefire-reports'
       - name: Archive Logs
         uses: actions/upload-artifact@v4
         if: ${{ failure() || cancelled() }}
         with:
-          name: logs-${{ runner.os }}-${{ matrix.java }}
+          name: logs-${{ runner.os }}-${{ matrix.java }}${{ matrix.additional-label }}
           path: '**/*.tests/target/**/*.log'
 
   build-maven-artifacts:
diff --git a/full-build.sh b/full-build.sh
index 6cecb1cfbb6..35c2529355a 100755
--- a/full-build.sh
+++ b/full-build.sh
@@ -11,9 +11,9 @@ while [ "$1" != "" ]; do
   VALUE=`echo $1 | awk -F= '{print $2}'`
   case $PARAM in
     -h | --help)
-      echo "Perform Maven build for xtext-xtend"
+      echo "Perform Maven/Tycho build for Xtext"
       echo ""
-      echo "./1-maven-build.sh"
+      echo "./full-build.sh"
       echo -e "\t-h --help"
       echo -e "\t--no-tests Skip test execution"
       echo -e "\t--local-repository=<PATH> Use local Maven repository"
diff --git a/full-deploy.sh b/full-deploy.sh
index 6fe0a2dfff6..a4af1af48ac 100755
--- a/full-deploy.sh
+++ b/full-deploy.sh
@@ -11,9 +11,9 @@ while [ "$1" != "" ]; do
   VALUE=`echo $1 | awk -F= '{print $2}'`
   case $PARAM in
     -h | --help)
-      echo "Perform Maven build for xtext-xtend"
+      echo "Perform Maven and p2 deployment for Xtext"
       echo ""
-      echo "./1-maven-build.sh"
+      echo "./full-deploy.sh"
       echo -e "\t-h --help"
       echo -e "\t--no-tests Skip test execution"
       echo -e "\t--local-repository=<PATH> Use local Maven repository"
diff --git a/jenkins/milestone-deploy/Jenkinsfile b/jenkins/milestone-deploy/Jenkinsfile
index 4b9ed847511..2dfffb01191 100644
--- a/jenkins/milestone-deploy/Jenkinsfile
+++ b/jenkins/milestone-deploy/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
   }
 
   tools {
-    jdk "temurin-jdk17-latest"
+    jdk "temurin-jdk21-latest"
   }
 
   stages {
diff --git a/jenkins/nightly-deploy/Jenkinsfile b/jenkins/nightly-deploy/Jenkinsfile
index aec7003b47b..2f7b833603c 100644
--- a/jenkins/nightly-deploy/Jenkinsfile
+++ b/jenkins/nightly-deploy/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
   }
 
   tools {
-    jdk "temurin-jdk17-latest"
+    jdk "temurin-jdk21-latest"
   }
 
   stages {
diff --git a/jenkins/release-deploy/Jenkinsfile b/jenkins/release-deploy/Jenkinsfile
index 3cc5f7e6108..6183e6dc1b5 100644
--- a/jenkins/release-deploy/Jenkinsfile
+++ b/jenkins/release-deploy/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
   }
 
   tools {
-    jdk "temurin-jdk17-latest"
+    jdk "temurin-jdk21-latest"
   }
 
   stages {
diff --git a/maven-build.sh b/maven-build.sh
deleted file mode 100755
index 87616581005..00000000000
--- a/maven-build.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-MVN_ARGS=(\
-  --fae \
-  -Dmaven.test.failure.ignore=true \
-  -Declipse.p2.mirrors=false \
-  -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-  -Dit-archetype-tests-skip=true \
-)
-
-# args parsing inspired by https://gist.github.com/jehiah/855086
-while [ "$1" != "" ]; do
-  PARAM=`echo $1 | awk -F= '{print $1}'`
-  VALUE=`echo $1 | awk -F= '{print $2}'`
-  case $PARAM in
-    -h | --help)
-      echo "Perform Maven build"
-      echo ""
-      echo "./1-maven-build.sh"
-      echo -e "\t-h --help"
-      echo -e "\t--no-tests Skip test execution"
-      echo -e "\t--local-repository=<PATH> Use local Maven repository"
-      echo ""
-      exit
-      ;;
-    --no-tests)
-      MVN_ARGS+=(-DskipTests=true)
-      ;;
-    --local-repository)
-      MVN_ARGS+=" -Dmaven.repo.local=$VALUE"
-      ;;
-    --tp)
-      MVN_ARGS+=" -Dtarget-platform-classifier=xtext-$VALUE"
-      ;;
-    *)
-      # append any additionally passed arg
-      if [ -z "$VALUE" ]; then
-        MVN_ARGS+=($PARAM)
-      else
-        MVN_ARGS+=($PARAM=$VALUE)
-      fi
-      ;;
-  esac
-  shift
-done
-
-MVN_ARGS+=(-PuseJenkinsSnapshots)
-# MVN_ARGS+=(-Pjavadoc)
-
-echo ./mvnw -B -f org.eclipse.xtext.maven.releng ${MVN_ARGS[@]} $@
-
-./mvnw -B \
-  -f org.eclipse.xtext.maven.releng \
-  clean deploy \
-  -DaltDeploymentRepository=local::default::file:./build/maven-repository \
-  ${MVN_ARGS[@]} \
-  $@