diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f02009334887b78b249a7e9a6f26c415e0ced978..684982d34ca602ac8ea0b7dcbaddd9018573306c 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim-bullseye
+FROM openjdk:21-jdk-slim-bullseye
 
 # Install some basic development utilities
 RUN apt-get update && apt-get install -y \ 
diff --git a/settings.gradle b/settings.gradle
index c6b655d8fb07e45c413ea5536b8261ab702ea301..3b32e8c203e06b7d373eddac5c0041d04d774618 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,5 +4,9 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = 'dotsAndBoxes'