diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 88747ea7..67a91660 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,2 +1,6 @@
-ARG VARIANT="14-buster"
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
\ No newline at end of file
+FROM mcr.microsoft.com/vscode/devcontainers/base:alpine-3.12
+RUN apk update
+RUN apk add --upgrade nodejs-current npm
+RUN npm i -g yarn rimraf
+RUN rimraf node_modules
+RUN yarn set version berry
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 851b58e2..709b5660 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,13 +1,10 @@
 {
 	"name": "Node.js",
 	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"VARIANT": "14"
-		}
+		"dockerfile": "Dockerfile"
 	},
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.shell.linux": "/bin/sh"
 	},
 	"extensions": [
 		"dbaeumer.vscode-eslint",
@@ -19,6 +16,5 @@
 		"fivethree.vscode-svelte-snippets",
 		"voorjaar.windicss-intellisense"
 	],
-	"postCreateCommand": "yarn",
-	"remoteUser": "node"
+	"postCreateCommand": "yarn && yarn dev"
 }
\ No newline at end of file