diff --git a/.devcontainer/devcontainer.json b/.devcontainer.json
similarity index 91%
rename from .devcontainer/devcontainer.json
rename to .devcontainer.json
index 70d29ccb93d..b803ceb0d76 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer.json
@@ -1,10 +1,10 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/ruby
 {
-    "name": "Go",
+    "name": "TrueCharts-Dev",
     "build": {
         "context": "..",
-        "dockerfile": "Dockerfile",
+        "dockerfile": "containers/dev/devcontainer/Dockerfile",
         "args": {
             "VARIANT": "1.16",
         }
diff --git a/.github/workflows/containers.build.yaml b/.github/workflows/containers.build.yaml
index a5f257dca9b..4a0799c5fac 100644
--- a/.github/workflows/containers.build.yaml
+++ b/.github/workflows/containers.build.yaml
@@ -8,11 +8,13 @@ on:
     paths:
     - 'containers/apps/**'
     - 'containers/base/**'
+    - 'containers/dev/**'
     - ".github/workflows/containers.build.yaml"
   pull_request:
     paths:
     - 'containers/apps/**'
     - 'containers/base/**'
+    - 'containers/dev/**'
     - ".github/workflows/containers.build.yaml"
 
 env:
@@ -37,6 +39,7 @@ jobs:
           changed:
           - 'containers/apps/**'
           - 'containers/base/**'
+          - 'containers/dev/**'
     - run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
     - id: reduce
       run: |
@@ -77,6 +80,8 @@ jobs:
       run: |
         if test -f "./containers/apps/${{ matrix.container }}/Dockerfile"; then
           CATEGORY="apps"
+        elif test -f "./containers/dev/${{ matrix.container }}/Dockerfile"; then
+          CATEGORY="dev"
         else
           CATEGORY="base"
         fi
diff --git a/.devcontainer/Dockerfile b/containers/dev/devcontainer/Dockerfile
similarity index 100%
rename from .devcontainer/Dockerfile
rename to containers/dev/devcontainer/Dockerfile