diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0a33a3c..6bf06ea 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
     "features": {
         "ghcr.io/devcontainers/features/powershell:1.1.0": {},
         "ghcr.io/devcontainers/features/docker-in-docker:2.2.1": {},
-        "ghcr.io/devcontainers/features/azure-cli:1": {}
+        "ghcr.io/devcontainers/features/azure-cli:1": {},
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/src/requirements.txt b/src/requirements.txt
index b6d87a5..907fd59 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -2,4 +2,4 @@ Flask==2.3.2
 gunicorn==20.1.0
 openai==0.27.8
 azure-identity==1.13.0
-python-dotenv==1.0.0
+python-dotenv==0.21.1 # Pinned due to docker-in-docker issue: https://github.com/devcontainers/features/issues/616