diff --git a/compiled_starters/java/.codecrafters/run.sh b/compiled_starters/java/.codecrafters/run.sh
index f924857..eca24f3 100755
--- a/compiled_starters/java/.codecrafters/run.sh
+++ b/compiled_starters/java/.codecrafters/run.sh
@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec java -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
+exec java --enable-preview -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
diff --git a/compiled_starters/java/codecrafters.yml b/compiled_starters/java/codecrafters.yml
index 510bd84..a08b71c 100644
--- a/compiled_starters/java/codecrafters.yml
+++ b/compiled_starters/java/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the Java version used to run your code
 # on Codecrafters.
 #
-# Available versions: java-24
-buildpack: java-24
+# Available versions: java-25
+buildpack: java-25
diff --git a/compiled_starters/java/pom.xml b/compiled_starters/java/pom.xml
index da20483..4bc74d4 100644
--- a/compiled_starters/java/pom.xml
+++ b/compiled_starters/java/pom.xml
@@ -9,14 +9,23 @@
     <version>1.0</version>
 
     <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>23</java.version>
+        <java.version>25</java.version>
     </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
diff --git a/compiled_starters/java/your_program.sh b/compiled_starters/java/your_program.sh
index d8a0bfc..cca5838 100755
--- a/compiled_starters/java/your_program.sh
+++ b/compiled_starters/java/your_program.sh
@@ -21,4 +21,4 @@ set -e # Exit early if any commands fail
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-exec java -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
+exec java --enable-preview -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
diff --git a/dockerfiles/java-25.Dockerfile b/dockerfiles/java-25.Dockerfile
new file mode 100644
index 0000000..0ef868e
--- /dev/null
+++ b/dockerfiles/java-25.Dockerfile
@@ -0,0 +1,13 @@
+# syntax=docker/dockerfile:1.7-labs
+FROM maven:3.9.11-eclipse-temurin-25-alpine
+
+# Ensures the container is re-built if dependency files change
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="pom.xml"
+
+WORKDIR /app
+
+# .git & README.md are unique per-repository. We ignore them on first copy to prevent cache misses
+COPY --exclude=.git --exclude=README.md . /app
+
+# Install language-specific dependencies
+RUN .codecrafters/compile.sh
diff --git a/solutions/java/01-dr6/code/.codecrafters/run.sh b/solutions/java/01-dr6/code/.codecrafters/run.sh
index f924857..eca24f3 100755
--- a/solutions/java/01-dr6/code/.codecrafters/run.sh
+++ b/solutions/java/01-dr6/code/.codecrafters/run.sh
@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec java -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
+exec java --enable-preview -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
diff --git a/solutions/java/01-dr6/code/codecrafters.yml b/solutions/java/01-dr6/code/codecrafters.yml
index 510bd84..a08b71c 100644
--- a/solutions/java/01-dr6/code/codecrafters.yml
+++ b/solutions/java/01-dr6/code/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the Java version used to run your code
 # on Codecrafters.
 #
-# Available versions: java-24
-buildpack: java-24
+# Available versions: java-25
+buildpack: java-25
diff --git a/solutions/java/01-dr6/code/pom.xml b/solutions/java/01-dr6/code/pom.xml
index da20483..4bc74d4 100644
--- a/solutions/java/01-dr6/code/pom.xml
+++ b/solutions/java/01-dr6/code/pom.xml
@@ -9,14 +9,23 @@
     <version>1.0</version>
 
     <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>23</java.version>
+        <java.version>25</java.version>
     </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
diff --git a/solutions/java/01-dr6/code/your_program.sh b/solutions/java/01-dr6/code/your_program.sh
index d8a0bfc..cca5838 100755
--- a/solutions/java/01-dr6/code/your_program.sh
+++ b/solutions/java/01-dr6/code/your_program.sh
@@ -21,4 +21,4 @@ set -e # Exit early if any commands fail
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-exec java -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
+exec java --enable-preview -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
diff --git a/starter_templates/java/code/.codecrafters/run.sh b/starter_templates/java/code/.codecrafters/run.sh
index f924857..eca24f3 100755
--- a/starter_templates/java/code/.codecrafters/run.sh
+++ b/starter_templates/java/code/.codecrafters/run.sh
@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec java -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
+exec java --enable-preview -jar /tmp/codecrafters-build-sqlite-java/codecrafters-sqlite.jar "$@"
diff --git a/starter_templates/java/code/pom.xml b/starter_templates/java/code/pom.xml
index da20483..4bc74d4 100644
--- a/starter_templates/java/code/pom.xml
+++ b/starter_templates/java/code/pom.xml
@@ -9,14 +9,23 @@
     <version>1.0</version>
 
     <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>23</java.version>
+        <java.version>25</java.version>
     </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>