diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 35b1d083..2a5a10af 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,6 +31,7 @@
 	"onCreateCommand": "python3 -m pip install -e .",
 	"features": {
 		"ghcr.io/devcontainers/features/git:1": {},
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
 	},
 	// Configure tool-specific properties.
 	"customizations": {
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 1ee8ea14..50efa80b 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -6,13 +6,13 @@ services:
     # folder. Note that the path of the Dockerfile and context is relative to the *primary*
     # docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
     # array). The sample below assumes your primary file is in the root of your project.
-    container_name: devcontainer
-    image: devcontainer
+    container_name: datajoint-python-devcontainer
+    image: datajoint/datajoint-python-devcontainer:${PY_VER:-3.11}-${DISTRO:-buster}
     build:
       context: .
       dockerfile: .devcontainer/Dockerfile
       args:
-        - PY_VER=${PY_VER:-3.8}
+        - PY_VER=${PY_VER:-3.11}
         - DISTRO=${DISTRO:-buster}
 
     volumes: