diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index c1d847724c2..00000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM ghcr.io/truecharts/devcontainer:v2.0.0
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8b7c541d374..bf418029032 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,14 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/ruby
 {
     "name": "Ruby",
-    "build": {
-        "context": "..",
-        "dockerfile": "Dockerfile",
-        "args": {
-            // Update 'VARIANT' to pick a Ruby version: 2, 2.7, 2.6, 2.5
-            "VARIANT": "2.7",
-        }
-    },
+    "image": "ghcr.io/truecharts/devcontainer:v2.0.1"
 
     // Set *default* container specific settings.json values on container create.
     "settings": {
@@ -19,7 +12,19 @@
     // Add the IDs of extensions you want installed when the container is created.
     "extensions": [
         "ms-kubernetes-tools.vscode-kubernetes-tools",
-        "rebornix.Ruby"
+        "rebornix.Ruby",
+        "github.vscode-pull-request-github",
+        "eamodio.gitlens",
+        "yzhang.markdown-all-in-one",
+        "davidanson.vscode-markdownlint",
+        "esbenp.prettier-vscode",
+        "2gua.rainbow-brackets",
+        "bmuskalla.vscode-tldr",
+        "visualstudioexptteam.vscodeintellicode",
+        "wingrunr21.vscode-ruby",
+        "redhat.vscode-yaml",
+        "spmeesseman.vscode-taskexplorer",
+        "formulahendry.code-runner"
     ],
 
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.vscode/launch.json b/.vscode/launch.json
index b619b7ba712..d7554ba8754 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,20 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "UnitTest - active spec file only",
-            "type": "Ruby",
-            "request": "launch",
-            "cwd": "${workspaceRoot}",
-            "program": "/usr/local/bin/bundle",
-            "args": [
-                "exec",
-                "m",
-                "-r",
-                "${relativeFile}"
-            ]
-        },
-        {
-            "name": "UnitTest - all spec files",
+            "name": "Common UnitTest - all tests",
             "type": "Ruby",
             "request": "launch",
             "cwd": "${workspaceRoot}",
@@ -29,6 +16,19 @@
                 "-r",
                 "${workspaceFolder}/tests"
             ]
+        },
+        {
+            "name": "Common UnitTest - active spec file only",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "/usr/local/bin/bundle",
+            "args": [
+                "exec",
+                "m",
+                "-r",
+                "${relativeFile}"
+            ]
         }
     ]
 }