diff --git a/containers/go/.devcontainer/Dockerfile b/containers/go/.devcontainer/Dockerfile
index 8e93a6a957..c5cda56148 100644
--- a/containers/go/.devcontainer/Dockerfile
+++ b/containers/go/.devcontainer/Dockerfile
@@ -23,6 +23,14 @@ RUN go get -u -v \
     github.com/mgechev/revive \
     github.com/derekparker/delve/cmd/dlv
 
+# gocode-gomod
+RUN go get -x -d github.com/stamblerre/gocode \
+    && go build -o gocode-gomod github.com/stamblerre/gocode \
+    && mv gocode-gomod $GOPATH/bin/
+
+# Copy default endpoint specific user settings overrides into container to specify Python path
+COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
+
 # Install git, process tools
 RUN apt-get update && apt-get -y install git procps
 
@@ -30,4 +38,3 @@ RUN apt-get update && apt-get -y install git procps
 RUN apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
-	
diff --git a/containers/go/.devcontainer/settings.vscode.json b/containers/go/.devcontainer/settings.vscode.json
new file mode 100644
index 0000000000..9043898797
--- /dev/null
+++ b/containers/go/.devcontainer/settings.vscode.json
@@ -0,0 +1,3 @@
+{
+    "go.gopath": "/go"
+}
\ No newline at end of file