diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 6adfdcac8c..4c284a62e9 100644
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -4,20 +4,21 @@
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
-          mvn-version: mvn38
-          java-version: openjdk17
+          mvn-version: mvn39
+          java-version: openjdk21
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
 
     stream: scandium
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
+    build-node: ubuntu2004-docker-4c-4g
     mvn-settings: "ovsdb-settings"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
@@ -39,6 +40,8 @@
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
+      - odl-maven-verify-jobs-jdk21:
+          build-node: ubuntu2004-docker-4c-4g
 
     stream: calcium
     project: "ovsdb"
@@ -80,11 +83,12 @@
 - project:
     name: ovsdb-sonar
     jobs:
-      - odl-sonar-jobs-jdk17
+      - odl-sonar-jobs-jdk21
 
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
+    build-node: ubuntu2004-docker-4c-4g
     build-timeout: 90
     mvn-settings: "ovsdb-settings"