diff --git a/http/pom.xml b/http/pom.xml
index 131ad74..f7932ed 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <azure.functions.maven.plugin.version>1.36.0</azure.functions.maven.plugin.version>
         <azure.functions.java.library.version>3.1.0</azure.functions.java.library.version>
         <functionAppName>contoso-functions</functionAppName>
@@ -83,7 +83,7 @@
                     <runtime>
                         <!-- runtime os, could be windows, linux or docker-->
                         <os>linux</os>
-                        <javaVersion>17</javaVersion>
+                        <javaVersion>21</javaVersion>
                     </runtime>
                     <appSettings>
                         <property>
diff --git a/infra/core/host/functions-flexconsumption.bicep b/infra/core/host/functions-flexconsumption.bicep
index d3de0ef..ae85fe9 100644
--- a/infra/core/host/functions-flexconsumption.bicep
+++ b/infra/core/host/functions-flexconsumption.bicep
@@ -17,7 +17,7 @@ param identityId string
   'dotnet-isolated', 'node', 'python', 'java', 'powershell', 'custom'
 ])
 param runtimeName string
-@allowed(['3.10', '3.11', '7.4', '8.0', '10', '11', '17', '20'])
+@allowed(['3.10', '3.11', '7.4', '8.0', '10', '11', '17', '20', '21'])
 param runtimeVersion string
 param kind string = 'functionapp,linux'
 
diff --git a/infra/main.bicep b/infra/main.bicep
index d5018d2..d4a8f22 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -59,7 +59,7 @@ module api './app/api.bicep' = {
     applicationInsightsName: monitoring.outputs.applicationInsightsName
     appServicePlanId: appServicePlan.outputs.id
     runtimeName: 'java'
-    runtimeVersion: '17'
+    runtimeVersion: '21'
     storageAccountName: storage.outputs.name
     identityId: apiUserAssignedIdentity.outputs.identityId
     identityClientId: apiUserAssignedIdentity.outputs.identityClientId