diff --git a/.github/workflows/puku.yaml b/.github/workflows/puku.yaml
index d5815d5..b5d434a 100644
--- a/.github/workflows/puku.yaml
+++ b/.github/workflows/puku.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build puku
-        run: ./pleasew build -p -v notice --profile release //package:release_files
+        run: ./pleasew build -p -v notice //package:release_files
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.plzconfig.release b/.plzconfig.release
deleted file mode 100644
index e781878..0000000
--- a/.plzconfig.release
+++ /dev/null
@@ -1,2 +0,0 @@
-[Plugin "go"]
-GoTool = //package:release_toolchain|go
\ No newline at end of file
diff --git a/knownimports/BUILD b/knownimports/BUILD
index b6d343e..ebdcdd3 100644
--- a/knownimports/BUILD
+++ b/knownimports/BUILD
@@ -1,10 +1,8 @@
-root = f"third_party/go/toolchain/pkg/{CONFIG.OS}_{CONFIG.ARCH}"
-
 genrule(
     name = "go_root_packages",
-    srcs = ["//third_party/go:toolchain"],
+    srcs = ["//third_party/go:std"],
     outs = ["go_root_packages"],
-    cmd = f'find {root} -name "*.a" | sed -e s=^{root}/== | sed -e s="\.a\$"== > $OUT',
+    cmd = 'find $SRCS -name "*.a" | sed -re s=^third_party/go/std/pkg/[^/]+_[^/]+/== | sed -e s="\.a\$"== > $OUT',
 )
 
 go_library(
diff --git a/knownimports/known_imports.go b/knownimports/known_imports.go
index 62cc1c7..1c35c6b 100644
--- a/knownimports/known_imports.go
+++ b/knownimports/known_imports.go
@@ -32,8 +32,7 @@ func IsInGoRoot(i string) bool {
 	if strings.HasPrefix(i, "crypto/") {
 		return true
 	}
-	_, ok := goRootImports[i]
-	if ok {
+	if _, ok := goRootImports[i]; ok {
 		return true
 	}
 
diff --git a/package/BUILD b/package/BUILD
index 65b2c51..3513c2f 100644
--- a/package/BUILD
+++ b/package/BUILD
@@ -8,12 +8,6 @@ filegroup(
 
 subinclude(":architectures")
 
-go_toolchain(
-    name = "release_toolchain",
-    architectures = architectures,
-    version = CONFIG.GO_VERSION,
-)
-
 def cross_compile(version, arch):
     return build_rule(
         name = f"puku_{arch}",
diff --git a/third_party/go/BUILD b/third_party/go/BUILD
index 4c8518d..389f84d 100644
--- a/third_party/go/BUILD
+++ b/third_party/go/BUILD
@@ -2,8 +2,8 @@ subinclude("///go//build_defs:go", "//package:architectures")
 
 go_toolchain(
     name = "toolchain",
-    architectures = architectures,
     version = CONFIG.GO_VERSION,
+    install_std = False,
 )
 
 go_stdlib(