diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 0be2b31d24..a21b8720f5 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -25,16 +25,18 @@
     staging-profile-id: 425e43800fea70
 
 - project:
-    name: autorelease-projects-openjdk17
+    name: autorelease-projects-openjdk
     jobs:
       - "autorelease-release-{stream}-{mvn-version}-{java-version}":
-          build-node: centos8-builder-8c-8g
+          build-node: ubuntu2004-docker-8c-8g
       - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
       - "autorelease-generate-release-notes-{stream}"
 
     stream:
       - scandium:
           branch: "master"
+          java-version: openjdk21
+          mvn-version: mvn39
           integration-test: calcium
       - calcium:
           branch: "stable/calcium"
@@ -45,7 +47,7 @@
 
     project: releng/autorelease
     project-name: autorelease
-    build-node: centos8-builder-2c-8g
+    build-node: ubuntu2004-docker-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
       **/*.prop