diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..ba112cd86c
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,15 @@
+{
+  "name": "istio build-tools",
+  "image": "gcr.io/istio-testing/build-tools:master-8c6fd99f50a8acae83a260340848097c002d2e0b",
+  "privileged": true,
+  "remoteEnv": {
+    "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
+    "BUILD_WITH_CONTAINER":"0",
+    "CARGO_HOME":"/home/.cargo",
+    "RUSTUP_HOME":"/home/.rustup"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
+    "ghcr.io/mpriscella/features/kind:1": {}
+  }
+}
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 9193dbd4b5..2f321b3dd5 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-c98e0d542f1b7a6a300eef1ac12c6c7af13ceb28
+591260c501031c31225bde5b08f1b07d55649bec
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
index af86c74fc0..be56a163ec 100644
--- a/common/Makefile.common.mk
+++ b/common/Makefile.common.mk
@@ -102,7 +102,7 @@ update-common:
 	@if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\
 		rm $(TMP)/common-files/files/CONTRIBUTING.md;\
 	fi
-	@cp -a $(TMP)/common-files/files/* $(shell pwd)
+	@cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.* $(shell pwd)
 	@rm -fr $(TMP)/common-files
 	@$(or $(COMMONFILES_POSTPROCESS), true)