diff --git a/WORKSPACE b/WORKSPACE
index 78138dab6..2cc0e06b2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,16 +8,13 @@ local_repository(
 load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")
 envoy_api_dependencies()
 
-load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
-load("@envoy//bazel:cc_configure.bzl", "cc_configure")
+load("@envoy//bazel:repositories.bzl", "envoy_dependencies", "GO_VERSION")
 
 envoy_dependencies()
 
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
 rules_foreign_cc_dependencies()
 
-cc_configure()
-
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 go_rules_dependencies()
-go_register_toolchains()
+go_register_toolchains(go_version = GO_VERSION)