diff --git a/.devcontainer/attribute-array/devcontainer.json b/.devcontainer/attribute-array/devcontainer.json
index bdebf13..4d5aa59 100644
--- a/.devcontainer/attribute-array/devcontainer.json
+++ b/.devcontainer/attribute-array/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Attribute array pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/attribute-array/source/",
     "postAttachCommand": "dotnet build Cosmos_Patterns_Attribute.sln",
diff --git a/.devcontainer/data-binning/devcontainer.json b/.devcontainer/data-binning/devcontainer.json
index 6829fc7..ca64124 100644
--- a/.devcontainer/data-binning/devcontainer.json
+++ b/.devcontainer/data-binning/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Data binning pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/data-binning/source/",
     "postAttachCommand": "dotnet build Cosmos_Patterns_Bucketing.csproj",
diff --git a/.devcontainer/distributed-counter/devcontainer.json b/.devcontainer/distributed-counter/devcontainer.json
index c63b4e6..9f1edeb 100644
--- a/.devcontainer/distributed-counter/devcontainer.json
+++ b/.devcontainer/distributed-counter/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Distributed counter pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/distributed-counter/source/",
     "postAttachCommand": "dotnet build Cosmos_Patterns_DistributedCounter.sln",
diff --git a/.devcontainer/distributed-lock/devcontainer.json b/.devcontainer/distributed-lock/devcontainer.json
index 6595910..b13486b 100644
--- a/.devcontainer/distributed-lock/devcontainer.json
+++ b/.devcontainer/distributed-lock/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Distributed lock pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/distributed-lock/source/",
     "postAttachCommand": "dotnet build consoleapp/Cosmos_Patterns_GlobalLock.sln",
diff --git a/.devcontainer/document-versioning/devcontainer.json b/.devcontainer/document-versioning/devcontainer.json
index 4272cca..75ec531 100644
--- a/.devcontainer/document-versioning/devcontainer.json
+++ b/.devcontainer/document-versioning/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Document versioning pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/document-versioning/source/",
     "postAttachCommand": "dotnet build function-app/function-app.csproj && dotnet build website/website.csproj",
diff --git a/.devcontainer/event-sourcing/devcontainer.json b/.devcontainer/event-sourcing/devcontainer.json
index 96b528f..2595075 100644
--- a/.devcontainer/event-sourcing/devcontainer.json
+++ b/.devcontainer/event-sourcing/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Event sourcing pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/event-sourcing/source/",
     "postAttachCommand": "dotnet build Cosmos_Patterns_EventSourcing.csproj",
diff --git a/.devcontainer/materialized-view/devcontainer.json b/.devcontainer/materialized-view/devcontainer.json
index 043f6b4..e3f0aaa 100644
--- a/.devcontainer/materialized-view/devcontainer.json
+++ b/.devcontainer/materialized-view/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Materialized view pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/materialized-view/source/",
     "postAttachCommand": "dotnet build data-generator/data-generator.csproj && dotnet build function-app/MaterializeViews.csproj",
diff --git a/.devcontainer/preallocation/devcontainer.json b/.devcontainer/preallocation/devcontainer.json
index d44a8a6..8c27aa7 100644
--- a/.devcontainer/preallocation/devcontainer.json
+++ b/.devcontainer/preallocation/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Preallocation pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/preallocation/source/",
     "postAttachCommand": "dotnet build Cosmos_Patterns_Preallocation.csproj",
diff --git a/.devcontainer/schema-versioning/devcontainer.json b/.devcontainer/schema-versioning/devcontainer.json
index c7f0d09..40c57d4 100644
--- a/.devcontainer/schema-versioning/devcontainer.json
+++ b/.devcontainer/schema-versioning/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Schema versioning pattern",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest",
+    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base:latest",
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
     "workspaceFolder": "/workspace/schema-versioning/source/",
     "postAttachCommand": "dotnet build data-generator/data-generator.csproj && dotnet build website/website.csproj",