diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
index d33d731f2..91f3d7f09 100644
--- a/ansible/roles/java-base/vars/main.yml
+++ b/ansible/roles/java-base/vars/main.yml
@@ -16,9 +16,7 @@ packages: {
   'rhel8': 'java-17-openjdk',
   'rhel9': 'java-17-openjdk',
   'smartos': 'openjdk17',
-  'ubuntu': 'openjdk-17-jre-headless',
-  'ubuntu1604': 'openjdk-8-jre-headless',
-  'ubuntu2204': 'openjdk-17-jre-headless',
+  'ubuntu': 'openjdk-25-jre-headless',
   }
 
 java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default(omit) }}"
diff --git a/ansible/roles/jenkins-workspace/tasks/main.yml b/ansible/roles/jenkins-workspace/tasks/main.yml
index fb2796b4b..ab65d7a23 100644
--- a/ansible/roles/jenkins-workspace/tasks/main.yml
+++ b/ansible/roles/jenkins-workspace/tasks/main.yml
@@ -137,9 +137,9 @@
     dest: /etc/apt/keyrings/nodesource-repo.gpg.asc
     url: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key
 
-- name: Add nodesource 20 repo
+- name: Add nodesource 22 repo
   apt_repository:
-    repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/nodesource-repo.gpg.asc] https://deb.nodesource.com/node_20.x nodistro main
+    repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/nodesource-repo.gpg.asc] https://deb.nodesource.com/node_22.x nodistro main
     state: present
 
 - name: Install node