diff --git a/Evergreen/Apps/Get-OracleJava21.ps1 b/Evergreen/Apps/Get-OracleJava21.ps1
new file mode 100644
index 00000000..403500a3
--- /dev/null
+++ b/Evergreen/Apps/Get-OracleJava21.ps1
@@ -0,0 +1,18 @@
+function Get-OracleJava21 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNullOrEmpty()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    $Output = Get-OracleJava -res $res
+    Write-Output -InputObject $Output
+}
diff --git a/Evergreen/Manifests/OracleJava17.json b/Evergreen/Manifests/OracleJava17.json
index 75cf1b26..468c8dcc 100644
--- a/Evergreen/Manifests/OracleJava17.json
+++ b/Evergreen/Manifests/OracleJava17.json
@@ -1,6 +1,6 @@
 {
     "Name": "Oracle Java 17",
-    "Source": "https://www.java.com",
+    "Source": "https://www.oracle.com/java/technologies/downloads/#java17",
     "Get": {
         "Update": {
             "Uri": "https://www.java.com/releases/releases.json",
diff --git a/Evergreen/Manifests/OracleJava20.json b/Evergreen/Manifests/OracleJava20.json
index b96152f6..83675960 100644
--- a/Evergreen/Manifests/OracleJava20.json
+++ b/Evergreen/Manifests/OracleJava20.json
@@ -1,6 +1,6 @@
 {
     "Name": "Oracle Java 20",
-    "Source": "https://www.java.com",
+    "Source": "https://www.oracle.com/java/technologies/downloads/#java20",
     "Get": {
         "Update": {
             "Uri": "https://www.java.com/releases/releases.json",
diff --git a/Evergreen/Manifests/OracleJava21.json b/Evergreen/Manifests/OracleJava21.json
new file mode 100644
index 00000000..62a6a020
--- /dev/null
+++ b/Evergreen/Manifests/OracleJava21.json
@@ -0,0 +1,40 @@
+{
+    "Name": "Oracle Java 21",
+    "Source": "https://www.oracle.com/java/technologies/downloads/#java21",
+    "Get": {
+        "Update": {
+            "Uri": "https://www.java.com/releases/releases.json",
+            "Headers": {
+                "scheme": "https",
+                "accept-language": "en-AU,en-GB;q=0.9,en;q=0.8,en-US;q=0.7",
+                "accept-encoding": "gzip, deflate, br",
+                "method": "GET",
+                "path": "/releases/releases.json",
+                "accept": "application/json",
+                "cache-control": "max-age=0",
+                "authority": "www.java.com"
+            },
+            "UserAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36 Edg/116.0.1938.81",
+            "Family": 21,
+            "DateFormat": "yyyy-MM-dd"
+        },
+        "Download": {
+            "Uri": {
+                "zip": "https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.zip",
+                "exe": "https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe",
+                "msi": "https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.msi"
+            }
+        }
+    },
+    "Install": {
+        "Setup": "",
+        "Physical": {
+            "Arguments": "",
+            "PostInstall": []
+        },
+        "Virtual": {
+            "Arguments": "",
+            "PostInstall": []
+        }
+    }
+}