diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 51ca0edf21..fdd8f6e081 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,7 +91,7 @@ VS Code Remote provides a straight forward development loop for creating and edi
       2. `kbstyle(F1)` > **Remote-Containers: Rebuild Container**.
       3. On failure: Follow the same workflow above.
 
-Note that if you make major changes, Docker may occasionally not pick up your edits. If this happens, you can delete the existing container and image, open the folder locally, and go to step 2 above. Install the [Docker extension](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker) locally (when not in a container) to make this easy
+Note that if you make major changes, Docker may occasionally not pick up your edits. If this happens, you can delete the existing container and image, open the folder locally, and go to step 2 above. Install the [Docker extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) locally (when not in a container) to make this easy
 
 After you get your container up and running, you can test it by adding test assets / projects into the definition folder and then adding their locations to the `.npmignore` file in [glob](https://facelessuser.github.io/wcmatch/glob/) form relative to the root of the folder. By convention, most definitions place test assets in a `test-project` folder and this path is referenced in the template `.npmignore` files.
 
diff --git a/container-templates/docker-compose/.devcontainer/docker-compose.yml b/container-templates/docker-compose/.devcontainer/docker-compose.yml
index 0f53113e5a..d481d8788e 100644
--- a/container-templates/docker-compose/.devcontainer/docker-compose.yml
+++ b/container-templates/docker-compose/.devcontainer/docker-compose.yml
@@ -20,12 +20,12 @@ services:
       # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
       - ..:/workspace  
 
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
-
-      # Uncomment the next line if you plan to install the Docker CLI. See the docker-in-docker-compose definition for details.
+      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker-compose for details.
       # - /var/run/docker.sock:/var/run/docker.sock 
 
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
+
     # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
     # cap_add:
     #   - SYS_PTRACE
diff --git a/container-templates/dockerfile/.devcontainer/devcontainer.json b/container-templates/dockerfile/.devcontainer/devcontainer.json
index a0717ec5b7..83554eb849 100644
--- a/container-templates/dockerfile/.devcontainer/devcontainer.json
+++ b/container-templates/dockerfile/.devcontainer/devcontainer.json
@@ -7,12 +7,14 @@
 
 	// The optional 'runArgs' property can be used to specify additional runtime arguments.
 	"runArgs": [
-		//  Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
+		// Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker for details.
 		// "-v","/var/run/docker.sock:/var/run/docker.sock",
 
-		// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust
-		// "--cap-add=SYS_PTRACE",
-		// "--security-opt", "seccomp=unconfined"
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",	
+		
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/container-templates/image/.devcontainer/devcontainer.json b/container-templates/image/.devcontainer/devcontainer.json
index a7f805c864..3e7875f105 100644
--- a/container-templates/image/.devcontainer/devcontainer.json
+++ b/container-templates/image/.devcontainer/devcontainer.json
@@ -7,12 +7,8 @@
 
 	// The optional 'runArgs' property can be used to specify additional runtime arguments.
 	"runArgs": [
-		//  Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
-		// "-v","/var/run/docker.sock:/var/run/docker.sock",
-
-		// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
-		// "--cap-add=SYS_PTRACE",
-		// "--security-opt", "seccomp=unconfined"
+		// Uncomment the line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/azure-ansible/.devcontainer/devcontainer.json b/containers/azure-ansible/.devcontainer/devcontainer.json
index 53eb9e0387..82655c51b5 100644
--- a/containers/azure-ansible/.devcontainer/devcontainer.json
+++ b/containers/azure-ansible/.devcontainer/devcontainer.json
@@ -4,6 +4,10 @@
 	"runArgs": [
 		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
 		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
+		
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
 		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
@@ -19,6 +23,12 @@
 	"extensions": [
 		"vscoss.vscode-ansible",
 		"redhat.vscode-yaml",
-		"ms-vscode.azurecli"
-	]
+		"ms-vscode.azurecli",
+		"ms-azuretools.vscode-docker"
+	],
+	"settings": {
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+		}
+	}
 }
diff --git a/containers/azure-blockchain/.devcontainer/devcontainer.json b/containers/azure-blockchain/.devcontainer/devcontainer.json
index e23e413b54..64c7cb9383 100644
--- a/containers/azure-blockchain/.devcontainer/devcontainer.json
+++ b/containers/azure-blockchain/.devcontainer/devcontainer.json
@@ -1,14 +1,19 @@
 {
 	"name": "Azure Blockchain",
 	"dockerFile": "Dockerfile",
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
+	
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
+	
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "az --version",
+
 	"extensions": [
 		"ms-vscode.azurecli",
 		"azblockchain.azure-blockchain"
diff --git a/containers/azure-cli/.devcontainer/devcontainer.json b/containers/azure-cli/.devcontainer/devcontainer.json
index 2c55e321f9..61f299f68a 100644
--- a/containers/azure-cli/.devcontainer/devcontainer.json
+++ b/containers/azure-cli/.devcontainer/devcontainer.json
@@ -2,8 +2,13 @@
 	"name": "Azure CLI",
 	"dockerFile": "Dockerfile",
 	
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/azure-functions-dotnetcore-2.1/.devcontainer/devcontainer.json b/containers/azure-functions-dotnetcore-2.1/.devcontainer/devcontainer.json
index 259730d3f4..65526a3253 100644
--- a/containers/azure-functions-dotnetcore-2.1/.devcontainer/devcontainer.json
+++ b/containers/azure-functions-dotnetcore-2.1/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 
diff --git a/containers/azure-functions-dotnetcore-latest/.devcontainer/devcontainer.json b/containers/azure-functions-dotnetcore-latest/.devcontainer/devcontainer.json
index 61a4d66fcb..2b1aff02a5 100644
--- a/containers/azure-functions-dotnetcore-latest/.devcontainer/devcontainer.json
+++ b/containers/azure-functions-dotnetcore-latest/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 
diff --git a/containers/azure-functions-java-8/.devcontainer/devcontainer.json b/containers/azure-functions-java-8/.devcontainer/devcontainer.json
index 509db82ea5..8f37aff61c 100644
--- a/containers/azure-functions-java-8/.devcontainer/devcontainer.json
+++ b/containers/azure-functions-java-8/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 
diff --git a/containers/azure-functions-node-8/.devcontainer/devcontainer.json b/containers/azure-functions-node-8/.devcontainer/devcontainer.json
index f89a0c6e9a..4216865b3a 100644
--- a/containers/azure-functions-node-8/.devcontainer/devcontainer.json
+++ b/containers/azure-functions-node-8/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 
diff --git a/containers/azure-functions-node-lts/.devcontainer/devcontainer.json b/containers/azure-functions-node-lts/.devcontainer/devcontainer.json
index de10df27b6..7e395088e6 100644
--- a/containers/azure-functions-node-lts/.devcontainer/devcontainer.json
+++ b/containers/azure-functions-node-lts/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 
diff --git a/containers/azure-functions-python-3/.devcontainer/devcontainer.json b/containers/azure-functions-python-3/.devcontainer/devcontainer.json
index 29c0eb9ea9..b53777e9af 100644
--- a/containers/azure-functions-python-3/.devcontainer/devcontainer.json
+++ b/containers/azure-functions-python-3/.devcontainer/devcontainer.json
@@ -3,20 +3,24 @@
 	"name": "Azure Functions & Python 3",
 	"dockerFile": "Dockerfile",
 	"appPort": [ 7071 ],
-	"runArgs": ["-v","/var/run/docker.sock:/var/run/docker.sock"],
+	"runArgs": [
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
 
-	// Uncomment the next line if you want to add in default container specific settings.json values
-	"settings":  {
-		"remote.extensionKind": {
-			"ms-azuretools.vscode-docker": "workspace"
-		}
-	},
+		"-v","/var/run/docker.sock:/var/run/docker.sock"
+	],
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "npm install",
 
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
+		"ms-azuretools.vscode-docker",
 		"ms-python.python"
-	]
+	],
+	"settings":  {
+		"remote.extensionKind": {
+			"ms-azuretools.vscode-docker": "workspace"
+		}
+	}
 }
\ No newline at end of file
diff --git a/containers/azure-machine-learning-python-3/.devcontainer/devcontainer.json b/containers/azure-machine-learning-python-3/.devcontainer/devcontainer.json
index 1780d25fcf..b113c16ad5 100644
--- a/containers/azure-machine-learning-python-3/.devcontainer/devcontainer.json
+++ b/containers/azure-machine-learning-python-3/.devcontainer/devcontainer.json
@@ -2,8 +2,11 @@
     "name": "Azure Machine Learning", 
     "dockerFile": "Dockerfile", 
 	"runArgs": [
-        "-v","/var/run/docker.sock:/var/run/docker.sock"
-    ],
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"-v", "/var/run/docker.sock:/var/run/docker.sock"
+	],
 	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
@@ -13,11 +16,11 @@
 	
 	"extensions": [ 
         "ms-toolsai.vscode-ai",
-        "peterjausovec.vscode-docker"
+        "ms-azuretools.vscode-docker"
     ], 
     "settings": {
         "remote.extensionKind": {
-            "peterjausovec.vscode-docker": "workspace"
+            "ms-azuretools.vscode-docker": "workspace"
         },
         "python.pythonPath": "/opt/conda/bin/python",
         "python.linting.pylintEnabled": true,
diff --git a/containers/azure-terraform/.devcontainer/devcontainer.json b/containers/azure-terraform/.devcontainer/devcontainer.json
index 9b9f2ba92d..69e3667728 100644
--- a/containers/azure-terraform/.devcontainer/devcontainer.json
+++ b/containers/azure-terraform/.devcontainer/devcontainer.json
@@ -4,7 +4,11 @@
 	"runArgs": [
 		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
 		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
-		"-v","/var/run/docker.sock:/var/run/docker.sock"
+		
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
@@ -20,6 +24,11 @@
 		"mauve.terraform",
 		"ms-azuretools.vscode-azureterraform",
 		"ms-vscode.azurecli",
-        "peterjausovec.vscode-docker"
-	]
+        "ms-azuretools.vscode-docker"
+	],
+	"settings": {
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+		}
+	}
 }
\ No newline at end of file
diff --git a/containers/bazel/.devcontainer/devcontainer.json b/containers/bazel/.devcontainer/devcontainer.json
index 8945618164..29822546a6 100644
--- a/containers/bazel/.devcontainer/devcontainer.json
+++ b/containers/bazel/.devcontainer/devcontainer.json
@@ -1,9 +1,13 @@
 {
 	"name": "Bazel",
 	"dockerFile": "Dockerfile",
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
 
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ]	
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/cpp/.devcontainer/devcontainer.json b/containers/cpp/.devcontainer/devcontainer.json
index 9dc807852a..6c1a5d4c17 100644
--- a/containers/cpp/.devcontainer/devcontainer.json
+++ b/containers/cpp/.devcontainer/devcontainer.json
@@ -1,10 +1,12 @@
 {
 	"name": "C++",
 	"dockerFile": "Dockerfile",
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt", "seccomp=unconfined"
-	],
+	"runArgs": [	
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
+	],	
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/dart/.devcontainer/devcontainer.json b/containers/dart/.devcontainer/devcontainer.json
index 6c9bf141ae..38270ec2c9 100644
--- a/containers/dart/.devcontainer/devcontainer.json
+++ b/containers/dart/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Dart",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/debian-9-git/.devcontainer/devcontainer.json b/containers/debian-9-git/.devcontainer/devcontainer.json
index 3ab3e4cdb5..71e03197aa 100644
--- a/containers/debian-9-git/.devcontainer/devcontainer.json
+++ b/containers/debian-9-git/.devcontainer/devcontainer.json
@@ -2,9 +2,14 @@
 	"name": "Debian 9 & Git",
 	"dockerFile": "Dockerfile",
 
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
 
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
+	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml b/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml
index 17dad0c7d4..2653564f0d 100644
--- a/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml
+++ b/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml
@@ -20,12 +20,12 @@ services:
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
 
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
-
-      # Uncomment the next line if you plan to install the Docker CLI. See the docker-in-docker-compose definition for details.
+      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker-compose for details.
       # - /var/run/docker.sock:/var/run/docker.sock 
 
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
+
     # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
     # cap_add:
     #   - SYS_PTRACE
diff --git a/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json b/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json
index 5d1ac44ad3..0b712d25a1 100644
--- a/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json
+++ b/containers/docker-existing-dockerfile/.devcontainer/devcontainer.json
@@ -10,11 +10,14 @@
 
 	// The optional 'runArgs' property can be used to specify additional runtime arguments.
 	"runArgs": [
-		//  Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
+		// Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker for details.
 		// "-v","/var/run/docker.sock:/var/run/docker.sock",
 
 		// Uncomment the next line if you will be using a ptrace-based debugger like C++, Go, and Rust.
-		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/docker-in-docker-compose/.devcontainer/devcontainer.json b/containers/docker-in-docker-compose/.devcontainer/devcontainer.json
index 0470adf76e..91af93e721 100644
--- a/containers/docker-in-docker-compose/.devcontainer/devcontainer.json
+++ b/containers/docker-in-docker-compose/.devcontainer/devcontainer.json
@@ -11,11 +11,11 @@
 	// "postCreateCommand": "docker --version"
 
 	"extensions": [
-		"peterjausovec.vscode-docker"
+		"ms-azuretools.vscode-docker"
 	],
 	"settings": {
 		"remote.extensionKind": {
-			"peterjausovec.vscode-docker": "workspace"
+			"ms-azuretools.vscode-docker": "workspace"
 		}
 	}
 }
\ No newline at end of file
diff --git a/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml b/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml
index 9831dcb350..e9762ea973 100644
--- a/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml
+++ b/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml
@@ -14,12 +14,12 @@ services:
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
 
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
-
       # Forwards the local Docker socket to the container.
       - /var/run/docker.sock:/var/run/docker.sock 
 
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
+
     # Uncomment the next four lines if you will use a ptrace-based debuggers like C++, Go, and Rust.
     # cap_add:
     #  - SYS_PTRACE
diff --git a/containers/docker-in-docker-compose/README.md b/containers/docker-in-docker-compose/README.md
index 055d5ef748..0d530686f9 100644
--- a/containers/docker-in-docker-compose/README.md
+++ b/containers/docker-in-docker-compose/README.md
@@ -16,7 +16,7 @@
 
 Dev containers can be useful for all types of applications including those that also deploy into a container based-environment. While you can directly build and run the application inside the dev container you create, you may also want to test it by deploying a built container image into your local Docker Desktop instance without affecting your dev container.
 
-This example illustrates how you can do this by running CLI commands and using the [Docker VS Code extension](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker) right from inside your dev container.  It installs the Docker extension inside the container so you can use its full feature set with your project.
+This example illustrates how you can do this by running CLI commands and using the [Docker VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) right from inside your dev container.  It installs the Docker extension inside the container so you can use its full feature set with your project.
 
 ## How it works / adapting your existing dev container config
 
@@ -51,7 +51,7 @@ You can adapt your own existing development container Docker Compose setup to su
     ```json
     "settings": {
         "remote.extensionKind": {
-            "peterjausovec.vscode-docker": "workspace"
+            "ms-azuretools.vscode-docker": "workspace"
         }
     },
     ```
diff --git a/containers/docker-in-docker/.devcontainer/devcontainer.json b/containers/docker-in-docker/.devcontainer/devcontainer.json
index b65c2c0b45..d97885d523 100644
--- a/containers/docker-in-docker/.devcontainer/devcontainer.json
+++ b/containers/docker-in-docker/.devcontainer/devcontainer.json
@@ -2,8 +2,12 @@
 	"name": "Docker in Docker",
 	"dockerFile": "Dockerfile",
 	"runArgs": [
-		// Uncomment the next linesif you will use a ptrace-based debugger like C++, Go, and Rust.
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
 		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
 		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
@@ -14,11 +18,11 @@
 	// "postCreateCommand": "docker --version",
 
 	"extensions": [
-		"peterjausovec.vscode-docker"
+		"ms-azuretools.vscode-docker"
 	],
 	"settings": {
 	    "remote.extensionKind": {
-			"peterjausovec.vscode-docker": "workspace"
+			"ms-azuretools.vscode-docker": "workspace"
 		}	
 	}
 }
\ No newline at end of file
diff --git a/containers/docker-in-docker/README.md b/containers/docker-in-docker/README.md
index 0ca3db1fb7..bd2d1b54e5 100644
--- a/containers/docker-in-docker/README.md
+++ b/containers/docker-in-docker/README.md
@@ -16,7 +16,7 @@
 
 Dev containers can be useful for all types of applications including those that also deploy into a container based-environment. While you can directly build and run the application inside the dev container you create, you may also want to test it by deploying a built container image into your local Docker Desktop instance without affecting your dev container.
 
-This example illustrates how you can do this by running CLI commands and using the [Docker VS Code extension](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker) right from inside your dev container. It installs the Docker extension inside the container so you can use its full feature set with your project.
+This example illustrates how you can do this by running CLI commands and using the [Docker VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) right from inside your dev container. It installs the Docker extension inside the container so you can use its full feature set with your project.
 
 ## How it works / adapting your existing dev container config
 
@@ -50,7 +50,7 @@ You can adapt your own existing development container Dockerfile to support this
     ```json
     "settings": {
         "remote.extensionKind": {
-            "peterjausovec.vscode-docker": "workspace"
+            "ms-azuretools.vscode-docker": "workspace"
         }
     },
     ```
diff --git a/containers/dotnetcore-2.1-fsharp/.devcontainer/devcontainer.json b/containers/dotnetcore-2.1-fsharp/.devcontainer/devcontainer.json
index 5add94a759..3bf7659a63 100644
--- a/containers/dotnetcore-2.1-fsharp/.devcontainer/devcontainer.json
+++ b/containers/dotnetcore-2.1-fsharp/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "F# (.NET Core 2.1)",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/dotnetcore-2.1/.devcontainer/devcontainer.json b/containers/dotnetcore-2.1/.devcontainer/devcontainer.json
index bc5f03edd9..a6bd7eebd4 100644
--- a/containers/dotnetcore-2.1/.devcontainer/devcontainer.json
+++ b/containers/dotnetcore-2.1/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "C# (.NET Core 2.1)",
 	"dockerFile": "Dockerfile",
 	
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/dotnetcore-latest-fsharp/.devcontainer/devcontainer.json b/containers/dotnetcore-latest-fsharp/.devcontainer/devcontainer.json
index 44d7680397..1151130c43 100644
--- a/containers/dotnetcore-latest-fsharp/.devcontainer/devcontainer.json
+++ b/containers/dotnetcore-latest-fsharp/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "F# (.NET Core Latest)",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/dotnetcore-latest/.devcontainer/devcontainer.json b/containers/dotnetcore-latest/.devcontainer/devcontainer.json
index e7a9f46f6b..7d86823361 100644
--- a/containers/dotnetcore-latest/.devcontainer/devcontainer.json
+++ b/containers/dotnetcore-latest/.devcontainer/devcontainer.json
@@ -1,6 +1,9 @@
 {
 	"name": "C# (.NET Core Latest)",
 	"dockerFile": "Dockerfile",
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
 	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/go/.devcontainer/devcontainer.json b/containers/go/.devcontainer/devcontainer.json
index f7f4a6f75f..f4129ff426 100644
--- a/containers/go/.devcontainer/devcontainer.json
+++ b/containers/go/.devcontainer/devcontainer.json
@@ -2,8 +2,10 @@
 	"name": "Go",
 	"dockerFile": "Dockerfile",
 	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt", "seccomp=unconfined"
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 	
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/java-11/.devcontainer/devcontainer.json b/containers/java-11/.devcontainer/devcontainer.json
index be775b6b10..cc2bcc0ff1 100644
--- a/containers/java-11/.devcontainer/devcontainer.json
+++ b/containers/java-11/.devcontainer/devcontainer.json
@@ -1,6 +1,9 @@
 {
 	"name": "Java 11",
 	"dockerFile": "Dockerfile",
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
 	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/java-12/.devcontainer/devcontainer.json b/containers/java-12/.devcontainer/devcontainer.json
index dad13a38c3..26c338857a 100644
--- a/containers/java-12/.devcontainer/devcontainer.json
+++ b/containers/java-12/.devcontainer/devcontainer.json
@@ -1,7 +1,10 @@
 {
 	"name": "Java 12",
 	"dockerFile": "Dockerfile",
-	
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json b/containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json
index 3dd6f10e23..297b94ab93 100644
--- a/containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json
+++ b/containers/java-8-tomcat-8.5/.devcontainer/devcontainer.json
@@ -1,7 +1,10 @@
 {
 	"name": "Java 8 & Tomcat 8.5",
 	"dockerFile": "Dockerfile",
-	
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/java-8/.devcontainer/devcontainer.json b/containers/java-8/.devcontainer/devcontainer.json
index 76a0194ead..387d27dd85 100644
--- a/containers/java-8/.devcontainer/devcontainer.json
+++ b/containers/java-8/.devcontainer/devcontainer.json
@@ -1,6 +1,9 @@
 {
 	"name": "Java 8",
 	"dockerFile": "Dockerfile",
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
 	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/javascript-node-8/.devcontainer/devcontainer.json b/containers/javascript-node-8/.devcontainer/devcontainer.json
index c91ec052e7..345a49dc7c 100644
--- a/containers/javascript-node-8/.devcontainer/devcontainer.json
+++ b/containers/javascript-node-8/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Node.js 8",
 	"dockerFile": "Dockerfile",
 	
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/javascript-node-lts-mongo/.devcontainer/docker-compose.yml b/containers/javascript-node-lts-mongo/.devcontainer/docker-compose.yml
index d0a0d1c30e..e79f93f2ef 100644
--- a/containers/javascript-node-lts-mongo/.devcontainer/docker-compose.yml
+++ b/containers/javascript-node-lts-mongo/.devcontainer/docker-compose.yml
@@ -12,8 +12,9 @@ services:
     
     volumes:
       - ..:/workspace
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
+
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
diff --git a/containers/javascript-node-lts-postgres/.devcontainer/docker-compose.yml b/containers/javascript-node-lts-postgres/.devcontainer/docker-compose.yml
index f9498a8a75..617a230f32 100644
--- a/containers/javascript-node-lts-postgres/.devcontainer/docker-compose.yml
+++ b/containers/javascript-node-lts-postgres/.devcontainer/docker-compose.yml
@@ -12,8 +12,9 @@ services:
     
     volumes:
       - ..:/workspace
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
+      
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
diff --git a/containers/javascript-node-lts/.devcontainer/devcontainer.json b/containers/javascript-node-lts/.devcontainer/devcontainer.json
index 24e77248cd..c9c1a94acc 100644
--- a/containers/javascript-node-lts/.devcontainer/devcontainer.json
+++ b/containers/javascript-node-lts/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Node.js (latest LTS)",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/kubernetes-helm/.devcontainer/devcontainer.json b/containers/kubernetes-helm/.devcontainer/devcontainer.json
index a4ffc78c53..5d2b4b3be9 100644
--- a/containers/kubernetes-helm/.devcontainer/devcontainer.json
+++ b/containers/kubernetes-helm/.devcontainer/devcontainer.json
@@ -4,10 +4,13 @@
 	"runArgs": [
 		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
 		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
+
 		"--mount", "type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock",
 		"--mount", "type=bind,source=${env:HOME}${env:USERPROFILE}/.kube,target=/root/.kube-localhost",
+
 		// Uncomment the next line to also sync certs in your .minikube folder
 		// "--mount", "type=bind,source=${env:HOME}${env:USERPROFILE}/.minikube,target=/root/.minikube-localhost",
+		
 		"-e", "SYNC_LOCALHOST_KUBECONFIG=true"
 	],
 
@@ -18,12 +21,12 @@
 	// "postCreateCommand": "kubectl version",
 
 	"extensions": [
-		"peterjausovec.vscode-docker",
+		"ms-azuretools.vscode-docker",
 		"ms-kubernetes-tools.vscode-kubernetes-tools"
 	],
 	"settings": {
 		"remote.extensionKind": {
-			"peterjausovec.vscode-docker": "workspace"
+			"ms-azuretools.vscode-docker": "workspace"
 		}	
 	}
 }
diff --git a/containers/kubernetes-helm/README.md b/containers/kubernetes-helm/README.md
index f0232a907f..5cb208ba5d 100644
--- a/containers/kubernetes-helm/README.md
+++ b/containers/kubernetes-helm/README.md
@@ -14,7 +14,7 @@
 
 Dev containers can be useful for all types of applications including those that also deploy into a container based-environment. While you can directly build and run the application inside the dev container you create, you may also want to test it by deploying a built container image into a local or remote [Kubernetes](https://kubernetes.io/) cluster without affecting your dev container.
 
-This example illustrates how you can do this by using CLIs ([kubectl](https://kubernetes.io/docs/reference/kubectl/overview/), [Helm](https://helm.sh), Docker), the [Kubernetes extension](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools), and the [Docker extension](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker) right from inside your dev container.  This definition builds up from the [docker-in-docker](../docker-in-docker) container definition to add Kubernetes and Helm support.  It installs the Docker and Kubernetes extensions inside the container so you can use its full feature set with your project.
+This example illustrates how you can do this by using CLIs ([kubectl](https://kubernetes.io/docs/reference/kubectl/overview/), [Helm](https://helm.sh), Docker), the [Kubernetes extension](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools), and the [Docker extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) right from inside your dev container.  This definition builds up from the [docker-in-docker](../docker-in-docker) container definition to add Kubernetes and Helm support.  It installs the Docker and Kubernetes extensions inside the container so you can use its full feature set with your project.
 
 The dev container also syncs your local Kubernetes config (`~/.kube/config` or `%USERPROFILE%\.kube\config`) into the container with the necessary modifications to allow it to interact with anything running on your local machine whenever the container or a terminal window is started. This includes interacting with a Kubernetes cluster managed through Docker Desktop or a local Minikube install.
 
@@ -44,7 +44,7 @@ You can adapt your own existing development container Dockerfile to support this
     ```json
     "settings": {
         "remote.extensionKind": {
-            "peterjausovec.vscode-docker": "workspace"
+            "ms-azuretools.vscode-docker": "workspace"
         }
     },
     ```
diff --git a/containers/markdown/.devcontainer/devcontainer.json b/containers/markdown/.devcontainer/devcontainer.json
index cb97aeda2d..7b189403a5 100644
--- a/containers/markdown/.devcontainer/devcontainer.json
+++ b/containers/markdown/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Markdown Editing",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/perl/.devcontainer/devcontainer.json b/containers/perl/.devcontainer/devcontainer.json
index f938eedca3..8351c91e5c 100644
--- a/containers/perl/.devcontainer/devcontainer.json
+++ b/containers/perl/.devcontainer/devcontainer.json
@@ -2,8 +2,10 @@
 	"name": "Perl",
 	"dockerFile": "Dockerfile",
 	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt", "seccomp=unconfined"
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/php-7/.devcontainer/devcontainer.json b/containers/php-7/.devcontainer/devcontainer.json
index 9c7cb5ac53..afd87f53e2 100644
--- a/containers/php-7/.devcontainer/devcontainer.json
+++ b/containers/php-7/.devcontainer/devcontainer.json
@@ -1,6 +1,9 @@
 {
 	"name": "PHP 7",
 	"dockerFile": "Dockerfile",
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
 		
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
diff --git a/containers/plantuml/.devcontainer/devcontainer.json b/containers/plantuml/.devcontainer/devcontainer.json
index bd4f08d338..aeeb856db7 100644
--- a/containers/plantuml/.devcontainer/devcontainer.json
+++ b/containers/plantuml/.devcontainer/devcontainer.json
@@ -1,7 +1,10 @@
 {
     "name": "PlantUML",
-    "dockerFile": "Dockerfile",
-		
+	"dockerFile": "Dockerfile",
+	
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/powershell/.devcontainer/devcontainer.json b/containers/powershell/.devcontainer/devcontainer.json
index f2fd532edc..0edb74a63d 100644
--- a/containers/powershell/.devcontainer/devcontainer.json
+++ b/containers/powershell/.devcontainer/devcontainer.json
@@ -1,7 +1,10 @@
 {
 	"name": "PowerShell",
 	"dockerFile": "Dockerfile",
-		
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/puppet/.devcontainer/devcontainer.json b/containers/puppet/.devcontainer/devcontainer.json
index c189e37c43..036f7a708e 100644
--- a/containers/puppet/.devcontainer/devcontainer.json
+++ b/containers/puppet/.devcontainer/devcontainer.json
@@ -1,18 +1,21 @@
 {
-  "name": "Puppet Development Kit - Dockerfile",
-  "dockerFile": "Dockerfile",
+	"name": "Puppet Development Kit - Dockerfile",
+	"dockerFile": "Dockerfile",
 
-  // Uncomment the next line if you want to publish any ports.
-  // "appPort": [],
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
 
-  // Uncomment the next line if you want to add in default container specific settings.json values
-  // "settings":  { "workbench.colorTheme": "Quiet Light" },
+	// Uncomment the next line if you want to publish any ports.
+	// "appPort": [],
 
-  // Uncomment the next line to run commands after the container is created.
-  // "postCreateCommand": "pdk --version",
+	// Uncomment the next line if you want to add in default container specific settings.json values
+	// "settings":  { "workbench.colorTheme": "Quiet Light" },
+
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "pdk --version",
 
   "extensions": [
-    "jpogran.puppet-vscode",
-    "rebornix.Ruby"
+	"jpogran.puppet-vscode",
+	"rebornix.Ruby"
   ]
 }
diff --git a/containers/python-2/.devcontainer/devcontainer.json b/containers/python-2/.devcontainer/devcontainer.json
index cf4a63e84b..2f769d30bb 100644
--- a/containers/python-2/.devcontainer/devcontainer.json
+++ b/containers/python-2/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"context": "..",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/python-3-anaconda/.devcontainer/devcontainer.json b/containers/python-3-anaconda/.devcontainer/devcontainer.json
index 06e70c4fec..8d1b93b363 100644
--- a/containers/python-3-anaconda/.devcontainer/devcontainer.json
+++ b/containers/python-3-anaconda/.devcontainer/devcontainer.json
@@ -2,7 +2,10 @@
 	"name": "Python 3 - Anaconda",
 	"context": "..",
 	"dockerFile": "Dockerfile",
-		
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/python-3-miniconda/.devcontainer/devcontainer.json b/containers/python-3-miniconda/.devcontainer/devcontainer.json
index 1cdba66fd1..83a1b69695 100644
--- a/containers/python-3-miniconda/.devcontainer/devcontainer.json
+++ b/containers/python-3-miniconda/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"context": "..",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/python-3-postgres/.devcontainer/docker-compose.yml b/containers/python-3-postgres/.devcontainer/docker-compose.yml
index a525438051..1b3007df93 100644
--- a/containers/python-3-postgres/.devcontainer/docker-compose.yml
+++ b/containers/python-3-postgres/.devcontainer/docker-compose.yml
@@ -8,8 +8,9 @@ services:
 
     volumes:
       - ..:/workspace
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
+      
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
diff --git a/containers/python-3/.devcontainer/devcontainer.json b/containers/python-3/.devcontainer/devcontainer.json
index 527ae81f81..6dae9c4662 100644
--- a/containers/python-3/.devcontainer/devcontainer.json
+++ b/containers/python-3/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"context": "..",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/r/.devcontainer/devcontainer.json b/containers/r/.devcontainer/devcontainer.json
index cadf4b77e9..8a9ecd7159 100644
--- a/containers/r/.devcontainer/devcontainer.json
+++ b/containers/r/.devcontainer/devcontainer.json
@@ -2,8 +2,10 @@
 	"name": "R",
 	"dockerFile": "Dockerfile",
 	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt", "seccomp=unconfined"
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/ruby-2-rails-5/.devcontainer/devcontainer.json b/containers/ruby-2-rails-5/.devcontainer/devcontainer.json
index 60e217ae8f..3eca735a9b 100644
--- a/containers/ruby-2-rails-5/.devcontainer/devcontainer.json
+++ b/containers/ruby-2-rails-5/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Ruby 2 Rails",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": ["80:80"],
 
diff --git a/containers/ruby-2-sinatra/.devcontainer/devcontainer.json b/containers/ruby-2-sinatra/.devcontainer/devcontainer.json
index f693b77ebc..26516c8abb 100644
--- a/containers/ruby-2-sinatra/.devcontainer/devcontainer.json
+++ b/containers/ruby-2-sinatra/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Ruby 2 Sinatra",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment and edit the next line if you want to publish any ports.
 	// "appPort": ["4567:4567"]
 
diff --git a/containers/ruby-2/.devcontainer/devcontainer.json b/containers/ruby-2/.devcontainer/devcontainer.json
index 9ef34351b0..0e1bd47ed9 100644
--- a/containers/ruby-2/.devcontainer/devcontainer.json
+++ b/containers/ruby-2/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Ruby 2",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/rust/.devcontainer/devcontainer.json b/containers/rust/.devcontainer/devcontainer.json
index fd17882fc5..2693e8247c 100644
--- a/containers/rust/.devcontainer/devcontainer.json
+++ b/containers/rust/.devcontainer/devcontainer.json
@@ -2,8 +2,10 @@
 	"name": "Rust",
 	"dockerFile": "Dockerfile",
 	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt", "seccomp=unconfined"
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/swift-4/.devcontainer/devcontainer.json b/containers/swift-4/.devcontainer/devcontainer.json
index 87b59a18d8..1a6121edce 100644
--- a/containers/swift-4/.devcontainer/devcontainer.json
+++ b/containers/swift-4/.devcontainer/devcontainer.json
@@ -2,9 +2,10 @@
 	"name": "Swift 4",
 	"dockerFile": "Dockerfile",
 	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined"
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+		
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
diff --git a/containers/typescript-node-8/.devcontainer/devcontainer.json b/containers/typescript-node-8/.devcontainer/devcontainer.json
index e06bbcda70..159ecd5f66 100644
--- a/containers/typescript-node-8/.devcontainer/devcontainer.json
+++ b/containers/typescript-node-8/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Node.js 8 & TypeScript",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/typescript-node-lts/.devcontainer/devcontainer.json b/containers/typescript-node-lts/.devcontainer/devcontainer.json
index e6e1dd704e..6b32986225 100644
--- a/containers/typescript-node-lts/.devcontainer/devcontainer.json
+++ b/containers/typescript-node-lts/.devcontainer/devcontainer.json
@@ -2,6 +2,9 @@
 	"name": "Node.js (latest LTS) & TypeScript",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
diff --git a/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json b/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json
index 27a6ce2bb0..3828b7e170 100644
--- a/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json
+++ b/containers/ubuntu-18.04-git/.devcontainer/devcontainer.json
@@ -2,9 +2,14 @@
 	"name": "Ubuntu 18.04 & Git",
 	"dockerFile": "Dockerfile",
 	
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
 
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
+	
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],