diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..02da378
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,23 @@
+//
+// Copyright 2024, Colias Group, LLC
+//
+// SPDX-License-Identifier: BSD-2-Clause
+//
+
+{
+	"name": "rust-root-task-demo",
+	"image": "rust-root-task-demo",
+
+	"customizations": {
+        "vscode": {
+            "extensions": [
+				"rust-lang.rust-analyzer"
+			],
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": null,
+                "rust-analyzer.check.allTargets": false,
+                "rust-analyzer.cargo.allTargets": false
+            }
+        }
+    }
+}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7288357..ad49a74 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -117,4 +117,6 @@ RUN set -eux; \
 
 ENV PATH=/home/x/.cargo/bin:$PATH
 
+ENV SHELL=/bin/bash
+
 WORKDIR /work
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 48d5c37..26bb669 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -6,4 +6,4 @@
 
 [toolchain]
 channel = "nightly-2024-09-01"
-components = [ "rustfmt", "rust-src", "rustc-dev", "llvm-tools-preview" ]
+components = [ "rustfmt", "rust-src", "rustc-dev", "llvm-tools-preview", "rust-analyzer" ]