diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 13e27c53..63318232 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -195,7 +195,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '23'
 
       - run: ./gradlew build
 
diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml
index 3d647ce2..8a0dacbc 100644
--- a/.github/workflows/java.yaml
+++ b/.github/workflows/java.yaml
@@ -88,7 +88,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '23'
       - uses: actions/setup-go@v5
         with:
           go-version: '^1.21'
diff --git a/dockerfiles/java.Dockerfile b/dockerfiles/java.Dockerfile
index 1ed11d4d..78a3eaaf 100644
--- a/dockerfiles/java.Dockerfile
+++ b/dockerfiles/java.Dockerfile
@@ -1,5 +1,5 @@
 # Build in a full featured container
-FROM eclipse-temurin:11 as build
+FROM eclipse-temurin:23 as build
 
 # Install protobuf compiler & git (needed if building SDK, rather than pulling it as dep)
 RUN apt-get update \
@@ -39,7 +39,7 @@ RUN CGO_ENABLED=0 ./temporal-features prepare --lang java --dir prepared --versi
 
 # Copy the CLI and prepared feature to a "run" container. Distroless isn't used here since we run
 # through Gradle and it's more annoying than it's worth to get its deps to line up
-FROM eclipse-temurin:11
+FROM eclipse-temurin:23
 ENV GRADLE_USER_HOME="/gradle"
 
 COPY --from=build /app/temporal-features /app/temporal-features
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..0f42aa19
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m