diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index c5907d6f..00000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM mcr.microsoft.com/vscode/devcontainers/base:debian
-
-WORKDIR /workspaces
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# Set Docker daemon config
-RUN \
-    mkdir -p /etc/docker \
-    && echo '{"storage-driver": "vfs"}' > /etc/docker/daemon.json
-
-# Installa aditional tools
-RUN \
-    apt-get update \
-    && apt-get install -y --no-install-recommends \
-        dbus \
-        network-manager \
-        libpulse0 \
-        xz-utils
-
-# Install docker
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        apt-transport-https \
-        ca-certificates \
-        curl \
-        software-properties-common \
-        gpg-agent \
-    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
-    && apt-get update && apt-get install -y --no-install-recommends \
-        docker-ce \
-        docker-ce-cli \
-        containerd.io \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install shellcheck
-RUN \
-    curl -fLs \
-        "https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz" \
-        | tar -xJ \
-    \
-    && mv -f "./shellcheck-stable/shellcheck" "/usr/bin/shellcheck" \
-    && rm -rf "./shellcheck-stable"
-
-# Generate a machine-id for this container
-RUN rm /etc/machine-id && dbus-uuidgen --ensure=/etc/machine-id
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 30e7edeb..42ce60ea 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,18 +1,23 @@
 {
-	"name": "Home Assistant Add-Ons",
-	"context": "..",
-	"dockerFile": "Dockerfile",
-	"appPort": ["7123:8123", "7357:4357"],
-    "postStartCommand": "service docker start",
-	"runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
-	"containerEnv": {
-		"WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
-	},
-	"extensions": [
-		"timonwong.shellcheck",
-		"esbenp.prettier-vscode"
-	],
-	"settings": { 
-		"terminal.integrated.shell.linux": "/bin/bash"
-	}
-}
+	"name": "Home Assistant Add-ons",
+    "image": "ghcr.io/home-assistant/devcontainer:addons",
+    "appPort": ["7123:8123", "7357:4357"],
+    "postStartCommand": "bash devcontainer_bootstrap",
+    "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
+    "containerEnv": {
+      "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+    },
+    "extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"],
+    "settings": {
+      "terminal.integrated.profiles.linux": {
+        "zsh": {
+          "path": "/usr/bin/zsh"
+        }
+      },
+      "terminal.integrated.defaultProfile.linux": "zsh",
+      "editor.formatOnPaste": false,
+      "editor.formatOnSave": true,
+      "editor.formatOnType": true,
+      "files.trimTrailingWhitespace": true
+    }
+  }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 81384a17..cb4e05c5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,31 +1,19 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Start Home Assistant",
-            "type": "shell",
-            "command": "./.devcontainer/supervisor.sh",
-            "group": {
-                "kind": "test",
-                "isDefault": true,
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": []
-        },{
-            "label": "Run Home Assistant CLI",
-            "type": "shell",
-            "command": "docker exec -ti hassio_cli /usr/bin/cli.sh",
-            "group": "test",
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": []
-        }
-    ]
-}
\ No newline at end of file
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start Home Assistant",
+      "type": "shell",
+      "command": "supervisor_run",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    }
+  ]
+}