diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index bc136453..aaa78bf0 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,12 +1,6 @@
-FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
+FROM ghcr.io/felipecrs/devcontainer:2
 
-USER vscode
-
-# Install Volta
-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
-
-ENTRYPOINT ["/usr/local/share/docker-init.sh"]
-CMD ["sleep", "infinity"]
+RUN --mount=type=bind,source=package.json,target=/tmp/package.json \
+  retry --tries 3 --sleep 15s -- volta install \
+  "node@$(jq -er .volta.node /tmp/package.json)" \
+  "yarn@$(jq -er .volta.yarn /tmp/package.json)"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 883dbe3f..6725e351 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,11 +2,6 @@
 {
   "dockerComposeFile": "../docker-compose.yml",
   "service": "dev",
-  "features": {
-    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
-      "moby": false
-    }
-  },
   "workspaceFolder": "${localWorkspaceFolder}",
   "forwardPorts": [10001, "hass:8123", "frigate:5000"],
   "portsAttributes": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d56cfb4..46142256 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,12 @@
----
 services:
   dev:
-    init: true
     build:
       context: .
       dockerfile: .devcontainer/Dockerfile
-    network_mode: host
     env_file:
       - .env
     volumes:
-      - /var/run/docker.sock:/var/run/docker-host.sock
+      - /var/run/docker.sock:/var/run/docker.sock
       - .:${LOCAL_WORKSPACE_FOLDER}:cached
   hass:
     extends: