diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml
index c187fc0..0351748 100644
--- a/.github/workflows/builder.yaml
+++ b/.github/workflows/builder.yaml
@@ -42,6 +42,12 @@ jobs:
           echo "version=$(head -1 ./${{ matrix.devcontainer }}/version)" >> $GITHUB_OUTPUT
           echo "gitsha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
+      - name: Lowercase repository_owner
+        id: repository_owner
+        run: |
+          GH_REPOSITORY_OWNER="${{ github.repository_owner }}"
+          echo "lc_owner=${GH_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT
+
       - name: 🛠️ Build devcontainer (${{ matrix.devcontainer }})
         uses: docker/build-push-action@v7.2.0
         with:
@@ -49,8 +55,8 @@ jobs:
           file: ./${{ matrix.devcontainer }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: |
-            ghcr.io/${{ github.repository_owner }}/devcontainer:${{ steps.get-version.outputs.version }}-${{ matrix.devcontainer }}
-            ghcr.io/${{ github.repository_owner }}/devcontainer:${{ matrix.devcontainer }}
-            ghcr.io/${{ github.repository_owner }}/devcontainer:${{ matrix.devcontainer }}-${{ steps.get-version.outputs.gitsha }}
+            ghcr.io/${{ steps.repository_owner.outputs.lc_owner }}/devcontainer:${{ steps.get-version.outputs.version }}-${{ matrix.devcontainer }}
+            ghcr.io/${{ steps.repository_owner.outputs.lc_owner }}/devcontainer:${{ matrix.devcontainer }}
+            ghcr.io/${{ steps.repository_owner.outputs.lc_owner }}/devcontainer:${{ matrix.devcontainer }}-${{ steps.get-version.outputs.gitsha }}
           push: ${{ github.event_name == 'push' }} 
 
diff --git a/apps/devcontainer.json b/apps/devcontainer.json
index dfc0b5c..250c0bc 100644
--- a/apps/devcontainer.json
+++ b/apps/devcontainer.json
@@ -6,7 +6,7 @@
   "appPort": ["7123:8123", "7357:4357"],
   "postStartCommand": "bash devcontainer_bootstrap",
   "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
-  "workspaceFolder": "/mnt/supervisor/addons/local/${localWorkspaceFolderBasename}",
+  "workspaceFolder": "/mnt/supervisor/apps/local/${localWorkspaceFolderBasename}",
   "workspaceMount": "source=${localWorkspaceFolder},target=${containerWorkspaceFolder},type=bind,consistency=cached",
   "containerEnv": {
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}",
diff --git a/apps/rootfs/usr/bin/devcontainer_bootstrap b/apps/rootfs/usr/bin/devcontainer_bootstrap
index 7df489d..d03f63f 100644
--- a/apps/rootfs/usr/bin/devcontainer_bootstrap
+++ b/apps/rootfs/usr/bin/devcontainer_bootstrap
@@ -2,7 +2,7 @@
 
 set -e
 
-workspace_mount="/mnt/supervisor/addons/local/$(basename "${WORKSPACE_DIRECTORY:?}")"
+workspace_mount="/mnt/supervisor/apps/local/$(basename "${WORKSPACE_DIRECTORY:?}")"
 if ! mountpoint -q "${workspace_mount}"; then
     echo "WARNING: Mounting ${WORKSPACE_DIRECTORY} to ${workspace_mount}." >&2
     echo "To avoid this warning, see https://github.com/home-assistant/devcontainer/pull/135." >&2
diff --git a/apps/version b/apps/version
index 7ed6ff8..1e8b314 100644
--- a/apps/version
+++ b/apps/version
@@ -1 +1 @@
-5
+6