diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 5c196009..32df1809 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -7,3 +7,5 @@ ARG HOME="/home/vscode"
 ENV VOLTA_HOME="${HOME}/.volta"
 ENV PATH="${VOLTA_HOME}/bin:${PATH}"
 RUN bash -c "$(curl -fsSL https://get.volta.sh)" -- --skip-setup
+
+CMD ["sleep", "infinity"]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9f34149b..7c51330b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,15 +1,16 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
   "dockerComposeFile": "../docker-compose.yml",
-  "service": "dev",
+  "service": "devcontainer",
   "features": {
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
-      "moby": false,
-      "dockerDashComposeVersion": "v2"
+      "moby": false
     }
   },
+  "updateRemoteUserUID": true,
   "workspaceFolder": "${localWorkspaceFolder}",
-  "shutdownAction": "stopCompose",
+  "initializeCommand": [".devcontainer/initialize.sh"],
+  "postCreateCommand": ["yarn", "install"],
   "forwardPorts": [10001, "hass:8123", "frigate:5000"],
   "portsAttributes": {
     "10001": {
@@ -25,8 +26,6 @@
       "onAutoForward": "silent"
     }
   },
-  "initializeCommand": ".devcontainer/initialize.sh",
-  "postCreateCommand": "yarn install",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -39,9 +38,12 @@
         "davidanson.vscode-markdownlint",
         "redhat.vscode-yaml",
         "lokalise.i18n-ally",
+        "vitest.explorer",
+        "inlang.vs-code-extension",
         "ms-azuretools.vscode-docker"
       ],
       "settings": {
+        "task.allowAutomaticTasks": "on",
         "files.eol": "\n",
         "editor.tabSize": 2,
         "editor.formatOnPaste": false,
diff --git a/.devcontainer/frigate-hass-integration b/.devcontainer/frigate-hass-integration
index f54791ce..070fbf2e 160000
--- a/.devcontainer/frigate-hass-integration
+++ b/.devcontainer/frigate-hass-integration
@@ -1 +1 @@
-Subproject commit f54791cef3c214eb8df4fd433beddc2b9e0a66a9
+Subproject commit 070fbf2eccda6c8437b82c3bc23dc95e80826375
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 53d59ad8..e8cbbcd0 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -20,7 +20,10 @@
           "endsPattern": "^created"
         }
       },
-      "isBackground": true
+      "isBackground": true,
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
     }
   ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index bc9e5cc1..84415b0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,8 @@
 ---
 services:
-  dev:
-    init: true
+  devcontainer:
     build: .devcontainer
-    entrypoint: /usr/local/share/docker-init.sh
-    command: sleep infinity
+    init: true
     env_file:
       - .env
     volumes: