diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 012830580..70aebf578 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -8,7 +8,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
         xorg-dev=1:7.7+22 \
         libayatana-appindicator3-dev=0.5.5-2+deb11u2 \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && go install -v golang.org/x/tools/gopls@latest
 
 
 WORKDIR /app
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d6c9556c9..7dce7f058 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,17 @@
 		"context": "..",
 		"dockerfile": "Dockerfile"
 	},
+	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
+		"ghcr.io/devcontainers/features/go:1": {
+			"version": "1.20"
+		}
+	},
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
-	"capAdd": ["NET_ADMIN", "SYS_ADMIN", "SYS_RESOURCE"],
+	"capAdd": [
+		"NET_ADMIN",
+		"SYS_ADMIN",
+		"SYS_RESOURCE"
+	],
 	"privileged": true
-}
+}
\ No newline at end of file