diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0285213c..7d47acd0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,15 +2,10 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
 	"name": "Lua Development",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
-	"features": {
-		"ghcr.io/devcontainers/features/common-utils:2": {
-			"installZsh": true,
-			"installOhMyZsh": true,
-			"upgradePackages": true
-		}
+	"build": {
+		"dockerfile": "Dockerfile"
 	},
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -31,7 +26,10 @@
 				"pprice.better-merge",
 				"ryu1kn.partial-diff",
 				"moshfeu.compare-folders",
-				"editorconfig.editorconfig"
+				"editorconfig.editorconfig",
+				"ms-vscode.vs-gitlense-compare",
+				"vsls-contrib.gitdoc",
+				"huizhou.githd"
 			],
 			"settings": {
 				"Lua.telemetry.enable": false,
@@ -44,6 +42,15 @@
 			}
 		}
 	},
-	"postCreateCommand": "sudo apt-get update && sudo apt-get install -y build-essential lua5.3 lua5.3-dev luarocks ripgrep fd-find curl && curl -L https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz | sudo tar xzf - -C /opt && sudo ln -s /opt/nvim-linux64/bin/nvim /usr/local/bin/nvim && sudo luarocks install luacheck",
+	"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
+	"postCreateCommand": {
+		"update": "sudo apt-get update",
+		"install-deps": "sudo apt-get install -y build-essential lua5.3 lua5.3-dev luarocks ripgrep fd-find curl git python3 python3-pip python3-venv",
+		"install-neovim": "curl -L https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz | sudo tar xzf - -C /opt",
+		"link-neovim": "sudo ln -s /opt/nvim-linux64/bin/nvim /usr/local/bin/nvim",
+		"install-luacheck": "sudo luarocks install luacheck",
+		"install-python-tools": "sudo pip3 install pynvim",
+		"configure-python": "sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1"
+	},
 	"remoteUser": "vscode"
 }