diff --git a/.github/devcontainer/base/.devcontainer/Dockerfile b/.github/.devcontainer/base/Dockerfile
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/Dockerfile
rename to .github/.devcontainer/base/Dockerfile
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/code-server.conf b/.github/.devcontainer/base/basic-env/supervisor/conf.d/code-server.conf
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/code-server.conf
rename to .github/.devcontainer/base/basic-env/supervisor/conf.d/code-server.conf
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/vnc.conf b/.github/.devcontainer/base/basic-env/supervisor/conf.d/vnc.conf
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/basic-env/supervisor/conf.d/vnc.conf
rename to .github/.devcontainer/base/basic-env/supervisor/conf.d/vnc.conf
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/logs/.gitkeep b/.github/.devcontainer/base/basic-env/supervisor/logs/.gitkeep
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/basic-env/supervisor/logs/.gitkeep
rename to .github/.devcontainer/base/basic-env/supervisor/logs/.gitkeep
diff --git a/.github/devcontainer/base/.devcontainer/basic-env/supervisor/supervisord.conf b/.github/.devcontainer/base/basic-env/supervisor/supervisord.conf
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/basic-env/supervisor/supervisord.conf
rename to .github/.devcontainer/base/basic-env/supervisor/supervisord.conf
diff --git a/.github/devcontainer/base/.devcontainer/devcontainer.json b/.github/.devcontainer/base/devcontainer.json
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/devcontainer.json
rename to .github/.devcontainer/base/devcontainer.json
diff --git a/.github/devcontainer/base/.devcontainer/user-dirs.dirs b/.github/.devcontainer/base/user-dirs.dirs
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/user-dirs.dirs
rename to .github/.devcontainer/base/user-dirs.dirs
diff --git a/.github/devcontainer/base/.devcontainer/xstartup b/.github/.devcontainer/base/xstartup
similarity index 100%
rename from .github/devcontainer/base/.devcontainer/xstartup
rename to .github/.devcontainer/base/xstartup
diff --git a/.github/devcontainer/dart/.devcontainer/Dockerfile b/.github/.devcontainer/dart/Dockerfile
similarity index 100%
rename from .github/devcontainer/dart/.devcontainer/Dockerfile
rename to .github/.devcontainer/dart/Dockerfile
diff --git a/.github/devcontainer/dart/.devcontainer/devcontainer.json b/.github/.devcontainer/dart/devcontainer.json
similarity index 100%
rename from .github/devcontainer/dart/.devcontainer/devcontainer.json
rename to .github/.devcontainer/dart/devcontainer.json
diff --git a/.github/devcontainer/java/.devcontainer/devcontainer.json b/.github/.devcontainer/java/devcontainer.json
similarity index 100%
rename from .github/devcontainer/java/.devcontainer/devcontainer.json
rename to .github/.devcontainer/java/devcontainer.json
diff --git a/.github/devcontainer/javascript/.devcontainer/devcontainer.json b/.github/.devcontainer/javascript/devcontainer.json
similarity index 100%
rename from .github/devcontainer/javascript/.devcontainer/devcontainer.json
rename to .github/.devcontainer/javascript/devcontainer.json
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
index 45a7501..0688f88 100644
--- a/.github/workflows/_build-and-push.yml
+++ b/.github/workflows/_build-and-push.yml
@@ -26,7 +26,7 @@ jobs:
       - name: "Pre-build '${{ inputs.image }}' image"
         uses: devcontainers/ci@v0.3
         with:
-          subFolder: .github/devcontainer/${{ inputs.image }}
+          subFolder: .github/.devcontainer/${{ inputs.image }}
           imageName: ghcr.io/${{ github.repository }}/${{ inputs.image }}
           cacheFrom: ghcr.io/${{ github.repository }}/${{ inputs.image }}
           push: ${{ github.event_name != 'pull_request' && 'always' || 'never' }}