diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 804a6d446..000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-ARG VARIANT=17-bullseye
-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.7-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 a732481a5..3aa67afc1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,32 +1,25 @@
 {
-	"name": "Petclinic",
-	"dockerFile": "Dockerfile",
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined",
-		"--mount",
-		"type=bind,source=${env:HOME}/.m2,target=/home/vscode/.m2",
-		"--mount",
-		"type=bind,source=${env:HOME}/.gradle,target=/home/vscode/.gradle",
-		"--env",
-		"GRADLE_USER_HOME=/home/vscode/.gradle"
-	],
-	"initializeCommand": "mkdir -p ${env:HOME}/.m2 ${env:HOME}/.gradle",
-	"postCreateCommand": "sudo chown vscode:vscode /home/vscode/.m2 /home/vscode/.gradle",
-	"remoteUser": "vscode",
-	"features": {
-		"docker-in-docker": "latest"
-	},
-	"extensions": [
-		"vscjava.vscode-java-pack",
-		"redhat.vscode-xml",
-		"vmware.vscode-boot-dev-pack",
-		"mhutchie.git-graph"
-	],
-	"forwardPorts": [8080],
-	"settings": {
-		"java.import.gradle.enabled": false,
-		"java.server.launchMode": "Standard"
-	}
+  "name": "Java",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "21-oracle",
+      "jdkDistro": "oracle"
+    },
+    "ghcr.io/devcontainers/features/azure-cli:1": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
+
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      "extensions": [
+        "redhat.vscode-xml",
+        "visualstudioexptteam.vscodeintellicode",
+        "vscjava.vscode-java-pack"
+      ]
+    }
+  },
+  "remoteUser": "vscode"
 }