diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 85c7f40ca..9782cf3de 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,3 +3,11 @@ FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
 
 ARG NODE_VERSION="none"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+ARG USER=vscode
+VOLUME /home/$USER/.m2
+VOLUME /home/$USER/.gradle
+
+ARG JAVA_VERSION=17.0.4.1-ms
+RUN sudo mkdir /home/$USER/.m2 /home/$USER/.gradle && sudo chown $USER:$USER /home/$USER/.m2 /home/$USER/.gradle
+RUN bash -lc '. /usr/local/sdkman/bin/sdkman-init.sh && sdk install java $JAVA_VERSION && sdk use java $JAVA_VERSION'
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4f13d43c7..138b7ca23 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -21,7 +21,8 @@
 	"extensions": [
 		"vscjava.vscode-java-pack",
 		"redhat.vscode-xml",
-		"Pivotal.vscode-boot-dev-pack"
+		"Pivotal.vscode-boot-dev-pack",
+		"mhutchie.git-graph"
 	],
 	"forwardPorts": [8080],
 	"settings": {