diff --git a/.devcontainer/base/Dockerfile b/.devcontainer/Dockerfile
similarity index 100%
rename from .devcontainer/base/Dockerfile
rename to .devcontainer/Dockerfile
diff --git a/.devcontainer/base/devcontainer.json b/.devcontainer/base/devcontainer.json
deleted file mode 100644
index a27e0ed..0000000
--- a/.devcontainer/base/devcontainer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "build": {
-        "dockerfile": "Dockerfile"
-    },
-    "features": {
-        "ghcr.io/devcontainers/features/azure-cli:1": {
-            "installBicep": true,
-            "extensions": "cosmosdb-preview"
-        }
-    },
-    "containerEnv": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-    },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-dotnettools.vscode-dotnet-runtime",
-                "ms-dotnettools.csharp",
-                "ms-azuretools.vscode-bicep"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5cbf880..2409f6a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,4 +1,24 @@
 {
     "name": "All patterns",
-    "image": "ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer:latest"
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/azure-cli:1": {
+            "installBicep": true,
+            "extensions": "cosmosdb-preview"
+        }
+    },
+    "containerEnv": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-dotnettools.vscode-dotnet-runtime",
+                "ms-dotnettools.csharp",
+                "ms-azuretools.vscode-bicep"
+            ]
+        }
+    }
 }
\ No newline at end of file
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index b94b1e8..2ee27dc 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -21,7 +21,6 @@ jobs:
         - name: 'Pre-build devcontainer image'
           uses: devcontainers/ci@v0.3
           with:
-            subFolder: .devcontainer/base/
             imageName: ghcr.io/azure-samples/cosmos-db-design-patterns/devcontainer-base
             noCache: true
             push: always