diff --git a/lib/compute/agent-node-config.ts b/lib/compute/agent-node-config.ts
index 2a0dd1ee..80a1dd9d 100644
--- a/lib/compute/agent-node-config.ts
+++ b/lib/compute/agent-node-config.ts
@@ -256,6 +256,10 @@ export class AgentNodeConfig {
                 key: 'JAVA24_HOME',
                 value: '/usr/lib/jvm/temurin-24-jdk-amd64',
               },
+              {
+                key: 'JAVA25_HOME',
+                value: '/usr/lib/jvm/temurin-25-jdk-amd64',
+              },
             ],
           },
         },
diff --git a/packer/scripts/macos/macos-agentsetup.sh b/packer/scripts/macos/macos-agentsetup.sh
index 9a40cbf7..0412add2 100644
--- a/packer/scripts/macos/macos-agentsetup.sh
+++ b/packer/scripts/macos/macos-agentsetup.sh
@@ -13,7 +13,8 @@ jdk_versions=(
     "20@https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz@1"
     "21@https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz@1"
     "23@https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_mac_hotspot_23_37.tar.gz@1"
-    "24@https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_mac_hotspot_24.0.1_9.tar.gz@100"
+    "24@https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_x64_mac_hotspot_24.0.1_9.tar.gz@1"
+    "25@https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_mac_hotspot_25_36.tar.gz@100"
 )
 
 ## Setup brew Defaults
@@ -35,7 +36,8 @@ if [ "$ARCH" = "arm64" ]; then
         "20@https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz@1"
         "21@https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz@1"
         "23@https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_mac_hotspot_23_37.tar.gz@1"
-        "24@https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_mac_hotspot_24.0.1_9.tar.gz@100"
+        "24@https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.1%2B9/OpenJDK24U-jdk_aarch64_mac_hotspot_24.0.1_9.tar.gz@1"
+        "25@https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_mac_hotspot_25_36.tar.gz@100"
     )
 fi
 
diff --git a/packer/scripts/ubuntu/ubuntu2404-agent-setups.sh b/packer/scripts/ubuntu/ubuntu2404-agent-setups.sh
index 7dc4b383..046c7c37 100755
--- a/packer/scripts/ubuntu/ubuntu2404-agent-setups.sh
+++ b/packer/scripts/ubuntu/ubuntu2404-agent-setups.sh
@@ -44,7 +44,7 @@ curl -o- https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo tee
 echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | sudo tee /etc/apt/sources.list.d/adoptium.list
 
 sudo apt-get update -y
-sudo apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk temurin-23-jdk temurin-24-jdk
+sudo apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk temurin-23-jdk temurin-24-jdk temurin-25-jdk
 # JDK14 required for gradle check to do bwc tests
 curl -SL "https://ci.opensearch.org/ci/dbc/tools/jdk/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz" -o jdk14.tar.gz
 tar -xzf jdk14.tar.gz && rm -v jdk14.tar.gz
@@ -73,5 +73,5 @@ sudo ln -s `which awsv2` /usr/local/bin/aws
 sudo aws --install
 aws --install
 
-sudo apt-mark hold docker.io openssh-server gh grub-efi* shim-signed temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk temurin-23-jdk temurin-24-jdk
+sudo apt-mark hold docker.io openssh-server gh grub-efi* shim-signed temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-21-jdk temurin-23-jdk temurin-24-jdk temurin-25-jdk
 sudo apt-get clean -y && sudo apt-get autoremove -y
diff --git a/resources/baseJenkins.yaml b/resources/baseJenkins.yaml
index 79f00943..70af9b54 100644
--- a/resources/baseJenkins.yaml
+++ b/resources/baseJenkins.yaml
@@ -212,6 +212,12 @@ tool:
           installers:
           - adoptOpenJdkInstaller:
               id: "jdk-24.0.1+9"
+    - name: "openjdk-25"
+      properties:
+      - installSource:
+          installers:
+          - adoptOpenJdkInstaller:
+              id: "jdk-25+36"
   mavenGlobalConfig:
     globalSettingsProvider: "standard"
     settingsProvider: "standard"