diff --git a/comparison.md b/comparison.md
index f12e79587..568aecac5 100644
--- a/comparison.md
+++ b/comparison.md
@@ -180,11 +180,11 @@ The following frameworks were added since the initial migration:
 
 #### Included in Default Manifest (3 JREs) ✅
 
-| JRE | Ruby File | Go File | Versions Supported | Default | Status |
-|-----|-----------|---------|-------------------|---------|--------|
-| **OpenJDK** | `open_jdk_jre.rb` | `openjdk.go` | 8, 11, 17, 21, 23 | 17.x | ✅ Complete |
-| **Zulu (Azul)** | `zulu_jre.rb` | `zulu.go` | 8, 11, 17 | 11.x | ✅ Complete |
-| **SAP Machine** | `sap_machine_jre.rb` | `sapmachine.go` | 11, 17 | 17.x | ✅ Complete |
+| JRE | Ruby File | Go File | Versions Supported                          | Default | Status |
+|-----|-----------|---------|---------------------------------------------|---------|--------|
+| **OpenJDK** | `open_jdk_jre.rb` | `openjdk.go` | 8, 11, 17, 21, 23                           | 17.x    | ✅ Complete |
+| **Zulu (Azul)** | `zulu_jre.rb` | `zulu.go` | 8, 11, 17                                   | 11.x    | ✅ Complete |
+| **SAP Machine** | `sap_machine_jre.rb` | `sapmachine.go` | 11(ruby only), 17, 21(go only), 25(go only) | 21.x    | ✅ Complete |
 
 #### BYOL JREs - Require Custom Manifest (4 JREs) ✅
 
diff --git a/manifest.yml b/manifest.yml
index 481f13d77..482033813 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -21,7 +21,7 @@ default_versions:
 - name: zulu
   version: 11.x
 - name: sapmachine
-  version: 17.x
+  version: 21.x
 - name: tomcat
   version: 10.1.x
 - name: tomcat-access-logging-support
@@ -259,16 +259,23 @@ dependencies:
 # SAP Machine JRE versions
 # Repository: https://github.com/SAP/SapMachine/releases
 - name: sapmachine
-  version: 11.0.25
-  uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.25/sapmachine-jre-11.0.25_linux-x64_bin.tar.gz
-  sha256: 10f3eb5b93c2c26f7c69a3690d5877b401b5ab24a6b1798fac5518beb1f1f839
+  version: 17.0.17
+  uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.17/sapmachine-jre-17.0.17_linux-x64_bin.tar.gz
+  sha256: c45d572629c722b18a6254f7503a397dbfe474223afb3ac96ef462d27074f7a0
   cf_stacks:
   - cflinuxfs4
 
 - name: sapmachine
-  version: 17.0.13
-  uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.13/sapmachine-jre-17.0.13_linux-x64_bin.tar.gz
-  sha256: b5f16befcb6415cfcf3bdb57b361c8eeca8176d494cd1e6c067cd56acec1afe6
+  version: 21.0.9
+  uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.9/sapmachine-jre-21.0.9_linux-x64_bin.tar.gz
+  sha256: 4cc6b1501a2fe8ae0f106342b3c00eec00b7886ce9215760b611cc9975bd339b
+  cf_stacks:
+  - cflinuxfs4
+
+- name: sapmachine
+  version: 25.0.1
+  uri: https://github.com/SAP/SapMachine/releases/download/sapmachine-25.0.1/sapmachine-jre-25.0.1_linux-x64_bin.tar.gz
+  sha256: 6bc007201b97214a3883e2da92dc80b2e5ae29378a7a77ab4077d74ccbfdfdbd
   cf_stacks:
   - cflinuxfs4
 
diff --git a/src/integration/java_main_test.go b/src/integration/java_main_test.go
index f19b15197..53b625581 100644
--- a/src/integration/java_main_test.go
+++ b/src/integration/java_main_test.go
@@ -105,7 +105,7 @@ func testJavaMain(platform switchblade.Platform, fixtures string) func(*testing.
 			it("deploys with SAPMachine JRE from manifest", func() {
 				_, logs, err := platform.Deploy.
 					WithEnv(map[string]string{
-						"BP_JAVA_VERSION":       "11",
+						"BP_JAVA_VERSION":       "17",
 						"JBP_CONFIG_COMPONENTS": `{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}`,
 					}).
 					Execute(name, filepath.Join(fixtures, "containers", "main"))
@@ -114,7 +114,7 @@ func testJavaMain(platform switchblade.Platform, fixtures string) func(*testing.
 				// Verify SAPMachine JRE was installed from manifest
 				Expect(logs.String()).To(ContainSubstring("Java Buildpack"))
 				Expect(logs.String()).To(ContainSubstring("Installing SAP Machine"))
-				Expect(logs.String()).To(ContainSubstring("11."))
+				Expect(logs.String()).To(ContainSubstring("17."))
 			})
 		})
 	}