diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index a2cf933..0000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-ARG IMAGE=bullseye
-FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE}
-RUN export DEBIAN_FRONTEND=noninteractive \
-     && apt-get update && apt-get install -y xdg-utils \
-     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
-RUN curl -fsSL https://aka.ms/install-azd.sh | bash
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1e81b28..6bf06ea 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,16 +1,12 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "python:3.11"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
     "forwardPorts": [50505],
     "features": {
         "ghcr.io/devcontainers/features/powershell:1.1.0": {},
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-        "ghcr.io/devcontainers/features/azure-cli:1": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2.2.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