diff --git a/features/src/workbench-tools/install.sh b/features/src/workbench-tools/install.sh
index 5bab83702..fe44371c5 100755
--- a/features/src/workbench-tools/install.sh
+++ b/features/src/workbench-tools/install.sh
@@ -20,6 +20,7 @@ readonly USER_HOME_DIR
 
 export DEBIAN_FRONTEND=noninteractive
 export TZ=Etc/UTC
+unset PYTHONPATH
 
 WORKDIR="$(mktemp -d)"
 readonly WORKDIR
diff --git a/src/example/.devcontainer.json b/src/example/.devcontainer.json
index 1c03f85c7..96d241feb 100644
--- a/src/example/.devcontainer.json
+++ b/src/example/.devcontainer.json
@@ -20,7 +20,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/aws-cli:1": {},
     "ghcr.io/dhoeric/features/google-cloud-cli:1": {}
diff --git a/src/jupyter-template/.devcontainer.json b/src/jupyter-template/.devcontainer.json
index 7ab389b8f..99326de74 100644
--- a/src/jupyter-template/.devcontainer.json
+++ b/src/jupyter-template/.devcontainer.json
@@ -28,7 +28,8 @@
       "username": "jupyter"
     },
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/aws-cli@sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef": {},
     "ghcr.io/dhoeric/features/google-cloud-cli@sha256:fa5d894718825c5ad8009ac8f2c9f0cea3d1661eb108a9d465cba9f3fc48965f": {},
diff --git a/src/nemo_jupyter/.devcontainer.json b/src/nemo_jupyter/.devcontainer.json
index 1b028dc31..f0fe8494c 100644
--- a/src/nemo_jupyter/.devcontainer.json
+++ b/src/nemo_jupyter/.devcontainer.json
@@ -21,7 +21,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/dhoeric/features/google-cloud-cli@sha256:fa5d894718825c5ad8009ac8f2c9f0cea3d1661eb108a9d465cba9f3fc48965f": {},
     "ghcr.io/devcontainers/features/node@sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6": {
diff --git a/src/nemo_jupyter_aou/.devcontainer.json b/src/nemo_jupyter_aou/.devcontainer.json
index e87d571fe..c4d5a319f 100644
--- a/src/nemo_jupyter_aou/.devcontainer.json
+++ b/src/nemo_jupyter_aou/.devcontainer.json
@@ -22,7 +22,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/dhoeric/features/google-cloud-cli@sha256:fa5d894718825c5ad8009ac8f2c9f0cea3d1661eb108a9d465cba9f3fc48965f": {},
     "./.devcontainer/features/workbench-tools": {
diff --git a/src/pgweb/.devcontainer.json b/src/pgweb/.devcontainer.json
index 1793ede5e..92fa311c4 100644
--- a/src/pgweb/.devcontainer.json
+++ b/src/pgweb/.devcontainer.json
@@ -14,7 +14,8 @@
   "postStartCommand": "/workspace/start-bookmark-refresh.sh",
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/aws-cli@sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef": {}
   },
diff --git a/src/r-analysis-aou/.devcontainer.json b/src/r-analysis-aou/.devcontainer.json
index e52e309e9..08b507ea7 100644
--- a/src/r-analysis-aou/.devcontainer.json
+++ b/src/r-analysis-aou/.devcontainer.json
@@ -10,7 +10,8 @@
   "postStartCommand": "./startupscript/remount-on-restart.sh rstudio /home/rstudio '${templateOption:cloud}' '${templateOption:login}' && ./setup-rstudio-env.sh rstudio",
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/rocker-org/devcontainer-features/r-packages@sha256:1a4ec64c4d2060e78e9c812bd3b3622c7e008465d566a2781c0e2b17a82592e5": {
       "packages": "shiny,shinydashboard",
diff --git a/src/r-analysis/.devcontainer.json b/src/r-analysis/.devcontainer.json
index 3aaa668bc..1e3df41b4 100644
--- a/src/r-analysis/.devcontainer.json
+++ b/src/r-analysis/.devcontainer.json
@@ -21,7 +21,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/rocker-org/devcontainer-features/r-packages@sha256:1a4ec64c4d2060e78e9c812bd3b3622c7e008465d566a2781c0e2b17a82592e5": {
       "packages": "shiny,shinydashboard",
diff --git a/src/ubuntu-example/.devcontainer.json b/src/ubuntu-example/.devcontainer.json
index ef8819b14..68c812d89 100644
--- a/src/ubuntu-example/.devcontainer.json
+++ b/src/ubuntu-example/.devcontainer.json
@@ -20,7 +20,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/aws-cli:1": {},
     "ghcr.io/dhoeric/features/google-cloud-cli:1": {},
diff --git a/src/vscode-docker/.devcontainer.json b/src/vscode-docker/.devcontainer.json
index 9790f1e0d..2e8fbe372 100644
--- a/src/vscode-docker/.devcontainer.json
+++ b/src/vscode-docker/.devcontainer.json
@@ -16,7 +16,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/aws-cli@sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef": {},
     "ghcr.io/dhoeric/features/google-cloud-cli@sha256:fa5d894718825c5ad8009ac8f2c9f0cea3d1661eb108a9d465cba9f3fc48965f": {},
diff --git a/src/vscode-with-llm/.devcontainer.json b/src/vscode-with-llm/.devcontainer.json
index 309c644fa..c44b16452 100644
--- a/src/vscode-with-llm/.devcontainer.json
+++ b/src/vscode-with-llm/.devcontainer.json
@@ -10,7 +10,8 @@
   "postStartCommand": "./startupscript/remount-on-restart.sh abc /config \"${templateOption:cloud}\" \"${templateOption:login}\"; /opt/llm-context/run-context-generator.sh /config || true",
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/node@sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6": {
       "version": "24.11.0"
diff --git a/src/vscode/.devcontainer.json b/src/vscode/.devcontainer.json
index 5ed4ad0c0..2f814ec41 100644
--- a/src/vscode/.devcontainer.json
+++ b/src/vscode/.devcontainer.json
@@ -16,7 +16,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-      "version": "17"
+      "version": "17",
+      "jdkDistro": "tem"
     },
     "ghcr.io/devcontainers/features/node@sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6": {
       "version": "24.11.0"
diff --git a/src/workbench-jupyter-parabricks-aou/.devcontainer.json b/src/workbench-jupyter-parabricks-aou/.devcontainer.json
index 24ef18ddf..27c3e693d 100644
--- a/src/workbench-jupyter-parabricks-aou/.devcontainer.json
+++ b/src/workbench-jupyter-parabricks-aou/.devcontainer.json
@@ -22,7 +22,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-          "version": "17"
+          "version": "17",
+          "jdkDistro": "tem"
         },
     "ghcr.io/dhoeric/features/google-cloud-cli@sha256:fa5d894718825c5ad8009ac8f2c9f0cea3d1661eb108a9d465cba9f3fc48965f": {},
     "ghcr.io/devcontainers/features/aws-cli@sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef":{},
diff --git a/src/workbench-jupyter-parabricks/.devcontainer.json b/src/workbench-jupyter-parabricks/.devcontainer.json
index e700caf4e..32a4515b1 100644
--- a/src/workbench-jupyter-parabricks/.devcontainer.json
+++ b/src/workbench-jupyter-parabricks/.devcontainer.json
@@ -21,7 +21,8 @@
   ],
   "features": {
     "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48": {
-          "version": "17"
+          "version": "17",
+          "jdkDistro": "tem"
         },
     "ghcr.io/dhoeric/features/google-cloud-cli@sha256:fa5d894718825c5ad8009ac8f2c9f0cea3d1661eb108a9d465cba9f3fc48965f": {},
     "ghcr.io/devcontainers/features/aws-cli@sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef":{},