diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..b8db1a5
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,12 @@
+FROM mcr.microsoft.com/devcontainers/java:1-21-bookworm
+
+# Ensure gnupg/curl available and add Yarn APT public key so apt can verify the repo
+RUN set -eux \
+  # Temporarily move Yarn APT source if present so apt-get update doesn't fail
+  && mv /etc/apt/sources.list.d/yarn*.list /tmp/ 2>/dev/null || true \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates curl \
+  && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg \
+  # Restore any moved Yarn source list(s)
+  && mv /tmp/yarn*.list /etc/apt/sources.list.d/ 2>/dev/null || true \
+  && rm -rf /var/lib/apt/lists/*
diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
new file mode 100644
index 0000000..648bf11
--- /dev/null
+++ b/.devcontainer/devcontainer-lock.json
@@ -0,0 +1,19 @@
+{
+  "features": {
+    "ghcr.io/devcontainers/features/dotnet:2.3.0": {
+      "version": "2.3.0",
+      "resolved": "ghcr.io/devcontainers/features/dotnet@sha256:edcfa7fed1eb62fc3b742b5a13e2279da4721dfd766819f04b24f4981ae99764",
+      "integrity": "sha256:edcfa7fed1eb62fc3b742b5a13e2279da4721dfd766819f04b24f4981ae99764"
+    },
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "1.8.0",
+      "resolved": "ghcr.io/devcontainers/features/java@sha256:9663ce0219ff85786e87901ce5f0a59f488edd5f99b46015192cda48468b233a",
+      "integrity": "sha256:9663ce0219ff85786e87901ce5f0a59f488edd5f99b46015192cda48468b233a"
+    },
+    "ghcr.io/devcontainers/features/python:1": {
+      "version": "1.8.0",
+      "resolved": "ghcr.io/devcontainers/features/python@sha256:fbcad6955caeecc5ad3f7886baf652e25cba5225a6c4c2287c536de2e5607511",
+      "integrity": "sha256:fbcad6955caeecc5ad3f7886baf652e25cba5225a6c4c2287c536de2e5607511"
+    }
+  }
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f829c63..067e951 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -28,8 +28,7 @@
 			"extensions": [
 				"ms-toolsai.jupyter",
 				"mongodb.mongodb-vscode",
-				"ms-dotnettools.csharp",
-				"ms-dotnettools.dotnet-interactive-vscode"
+				"ms-dotnettools.csharp"			
 			]
 		}
 	},
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index f8c19bf..d4dbb98 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,9 @@ version: '3.8'
 
 services:
   jedee:
-    image: mcr.microsoft.com/devcontainers/java:1-21-bookworm
+    build:
+      context: .
+      dockerfile: Dockerfile
     volumes:
       - ../..:/workspaces:cached