diff --git a/pw_build/go.gni b/pw_build/go.gni
index ce84061..3434883 100644
--- a/pw_build/go.gni
+++ b/pw_build/go.gni
@@ -122,7 +122,10 @@
     program = "go"
     args = [ "get" ]
     deps = [ ":$_deps_metadata_target_name" ] + invoker.deps
-    env = [ "GOPATH=$_default_gopath" ]
+    env = [
+      "GO111MODULE=off",
+      "GOPATH=$_default_gopath",
+    ]
     args_file = _deps_metadata_file
 
     # If the args file is empty, don't run the "go get" command.
@@ -145,7 +148,10 @@
       ":$_download_target_name",
       ":$_metadata_target_name",
     ]
-    env = [ "GOPATH+=$_default_gopath" ]
+    env = [
+      "GO111MODULE=off",
+      "GOPATH+=$_default_gopath",
+    ]
     env_file = _metadata_file
 
     _binary_name = get_path_info(invoker.package, "name")
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
index aabc647..137eae9 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
@@ -57,9 +57,9 @@
     ]
   },
   {
-    "path": "infra/go/${os}-${arch=amd64}",
+    "path": "infra/3pp/tools/go/${platform}",
     "tags": [
-      "version:1.13.5"
+      "version:2@1.16.3"
     ]
   },
   {