diff --git a/.devcontainer.json b/.devcontainer.json
deleted file mode 100644
index d5d3aa1..0000000
--- a/.devcontainer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "Java",
-    "image": "mcr.microsoft.com/vscode/devcontainers/base:1-ubuntu-24.04",
-    "features": {
-	"ghcr.io/guiyomh/features/just:0": {},
-        "ghcr.io/devcontainers/features/java:1": {
-            "version": "24-open",
-            "installMaven": true
-        }
-    },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "vscjava.vscode-java-pack"
-            ]
-        }
-    }
-}
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..c2644d9
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,3 @@
+# Debian 13 (Trixie) + OpenJDK 25
+FROM mcr.microsoft.com/devcontainers/java:25-trixie
+RUN apt-get update && apt-get install -y maven just hyperfine lazygit
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..50bfd0b
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,14 @@
+{
+    "name": "Java",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": ["vscjava.vscode-java-pack"]
+        },
+        "zed": {
+            "extensions": ["java", "just", "xml"]
+        }
+    }
+}