diff --git a/.java-version b/.java-version
index 98d9bcb7..aabe6ec3 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-17
+21
diff --git a/Dockerfile b/Dockerfile
index 5ec43e5b..03ae213c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjdk-alpine:17.0.2
+FROM bellsoft/liberica-openjdk-alpine:21
 
 WORKDIR /app
 
diff --git a/pom.xml b/pom.xml
index 3b4ce5dd..058c311a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
   <!-- (21) <properties/> -->
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <mainClass>edu.ucsb.cs156.example.ExampleApplication</mainClass>
     <app.package>edu.ucsb.cs156.example</app.package>
     <app.packagePath>edu/ucsb/cs156/example</app.packagePath>