diff --git a/go/extractor/registries/BUILD.bazel b/go/extractor/registries/BUILD.bazel
new file mode 100644
index 00000000000..8c002f20db2
--- /dev/null
+++ b/go/extractor/registries/BUILD.bazel
@@ -0,0 +1,16 @@
+# generated running `bazel run //go/gazelle`, do not edit
+
+load("@rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "registries",
+    srcs = ["registryproxy.go"],
+    importpath = "github.com/github/codeql-go/extractor/registries",
+    visibility = ["//visibility:public"],
+)
+
+go_test(
+    name = "registries_test",
+    srcs = ["registryproxy_test.go"],
+    embed = [":registries"],
+)
diff --git a/go/extractor/util/registryproxy.go b/go/extractor/registries/registryproxy.go
similarity index 99%
rename from go/extractor/util/registryproxy.go
rename to go/extractor/registries/registryproxy.go
index 600c05a5af1..793bec5a41d 100644
--- a/go/extractor/util/registryproxy.go
+++ b/go/extractor/registries/registryproxy.go
@@ -1,4 +1,4 @@
-package util
+package registries
 
 import (
 	"encoding/json"
diff --git a/go/extractor/util/registryproxy_test.go b/go/extractor/registries/registryproxy_test.go
similarity index 99%
rename from go/extractor/util/registryproxy_test.go
rename to go/extractor/registries/registryproxy_test.go
index ef63bd9d3f8..c564040ff1b 100644
--- a/go/extractor/util/registryproxy_test.go
+++ b/go/extractor/registries/registryproxy_test.go
@@ -1,4 +1,4 @@
-package util
+package registries
 
 import (
 	"testing"
diff --git a/go/extractor/toolchain/BUILD.bazel b/go/extractor/toolchain/BUILD.bazel
index 58374999323..16c591f2a96 100644
--- a/go/extractor/toolchain/BUILD.bazel
+++ b/go/extractor/toolchain/BUILD.bazel
@@ -7,7 +7,10 @@ go_library(
     srcs = ["toolchain.go"],
     importpath = "github.com/github/codeql-go/extractor/toolchain",
     visibility = ["//visibility:public"],
-    deps = ["//go/extractor/util"],
+    deps = [
+        "//go/extractor/registries",
+        "//go/extractor/util",
+    ],
 )
 
 go_test(
diff --git a/go/extractor/toolchain/toolchain.go b/go/extractor/toolchain/toolchain.go
index 01b3ab813bd..fb9d5512cd8 100644
--- a/go/extractor/toolchain/toolchain.go
+++ b/go/extractor/toolchain/toolchain.go
@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/github/codeql-go/extractor/registries"
 	"github.com/github/codeql-go/extractor/util"
 )
 
@@ -140,7 +141,7 @@ func SupportsWorkspaces() bool {
 // Constructs a `*exec.Cmd` for `go` with the specified arguments.
 func GoCommand(arg ...string) *exec.Cmd {
 	cmd := exec.Command("go", arg...)
-	util.ApplyProxyEnvVars(cmd)
+	registries.ApplyProxyEnvVars(cmd)
 	return cmd
 }
 
diff --git a/go/extractor/util/BUILD.bazel b/go/extractor/util/BUILD.bazel
index ee090607ced..ccebf5ebd86 100644
--- a/go/extractor/util/BUILD.bazel
+++ b/go/extractor/util/BUILD.bazel
@@ -8,7 +8,6 @@ go_library(
         "extractvendordirs.go",
         "logging.go",
         "overlays.go",
-        "registryproxy.go",
         "semver.go",
         "util.go",
     ],
@@ -21,7 +20,6 @@ go_test(
     name = "util_test",
     srcs = [
         "logging_test.go",
-        "registryproxy_test.go",
         "semver_test.go",
         "util_test.go",
     ],