diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c64f8b71..b85d1982 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,7 @@
 {
 	"name": "Dapr CLI Dev Environment",
 	// Update the container version when you publish dev-container
-	"image": "ghcr.io/dapr/dapr-dev:0.1.8",
-	// Replace with uncommented line below to build your own local copy of the image
-	// "dockerFile": "../docker/Dockerfile-dev",
+	"image": "ghcr.io/dapr/dapr-dev:latest",
 	"containerEnv": {
 		// Uncomment to overwrite devcontainer .kube/config and .minikube certs with the localhost versions
 		// each time the devcontainer starts, if the respective .kube-localhost/config and .minikube-localhost
@@ -21,12 +19,16 @@
 		"ms-azuretools.vscode-docker",
 		"ms-kubernetes-tools.vscode-kubernetes-tools"
 	],
+	"features": {
+		"ghcr.io/devcontainers/features/sshd:1": {},
+		"ghcr.io/devcontainers/features/github-cli:1": {},
+	},
 	"mounts": [
 		// Mount docker-in-docker library volume
 		"type=volume,source=dind-var-lib-docker,target=/var/lib/docker",
 
 		// Bind mount docker socket under an alias to support docker-from-docker
-		"type=bind,source=/var/run/docker.sock,target=/var/run/docker-host.sock",
+		"type=bind,source=/var/run/docker.sock,target=/var/run/docker-host.sock"
 
 		// Uncomment to clone local .kube/config into devcontainer
 		// "type=bind,source=${env:HOME}${env:USERPROFILE}/.kube,target=/home/dapr/.kube-localhost",
@@ -59,8 +61,10 @@
 	"settings": {
 		"go.toolsManagement.checkForUpdates": "local",
 		"go.useLanguageServer": true,
-		"go.gopath": "/go"
+		"go.gopath": "/go",
+		"go.buildTags": "e2e,perf,conftests,unit,integration_test,certtests",
+		"git.alwaysSignOff": true
 	},
 	"workspaceFolder": "/workspaces/cli",
-	"workspaceMount": "type=bind,source=${localWorkspaceFolder},target=/workspaces/cli",
+	"workspaceMount": "type=bind,source=${localWorkspaceFolder},target=/workspaces/cli"
 }
\ No newline at end of file