diff --git a/cmd/coordinator/Dockerfile.0 b/cmd/coordinator/Dockerfile.0
index 4d5095a..986881e 100644
--- a/cmd/coordinator/Dockerfile.0
+++ b/cmd/coordinator/Dockerfile.0
@@ -52,8 +52,8 @@
 RUN cd /go/src/google.golang.org/grpc && \
     git reset --hard 50955793b0183f9de69bd78e2ec251cf20aab121
 
-RUN go get go4.org/grpc && \
-    cd /go/src/go4.org/grpc && git reset --hard 32ab3eb96f50a8c0f4103aa8d149cd1f15576636
+RUN go get grpc.go4.org && \
+    cd /go/src/grpc.go4.org && git reset --hard 11d0a25b491971beb5a4625ea7856a3c4afaafa5
 
 # Makefile passes a string with --build-arg version
 # This becomes part of the cache key for all subsequent instructions,
diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
index 679e5c6..0761af5 100644
--- a/cmd/coordinator/coordinator.go
+++ b/cmd/coordinator/coordinator.go
@@ -43,8 +43,8 @@
 	"sync/atomic"
 	"time"
 
-	"go4.org/grpc"
 	"go4.org/syncutil"
+	"grpc.go4.org"
 
 	"cloud.google.com/go/storage"
 	"golang.org/x/build"
diff --git a/maintner/maintnerd/Dockerfile.0 b/maintner/maintnerd/Dockerfile.0
index 068aae9..f63ea67 100644
--- a/maintner/maintnerd/Dockerfile.0
+++ b/maintner/maintnerd/Dockerfile.0
@@ -31,8 +31,8 @@
 RUN go get golang.org/x/crypto/acme/autocert && \
     cd /go/src/golang.org/x/crypto && git reset --hard c7af5bf2638a1164f2eb5467c39c6cffbd13a02e
 
-RUN go get go4.org/grpc && \
-    cd /go/src/go4.org/grpc && git reset --hard 32ab3eb96f50a8c0f4103aa8d149cd1f15576636
+RUN go get grpc.go4.org && \
+    cd /go/src/grpc.go4.org && git reset --hard 11d0a25b491971beb5a4625ea7856a3c4afaafa5
 
 # Optimization to speed COPY+go install steps later. This go install
 # isn't required for correctness.
diff --git a/maintner/maintnerd/apipb/api.pb.go b/maintner/maintnerd/apipb/api.pb.go
index cb77811..a1ae68d 100644
--- a/maintner/maintnerd/apipb/api.pb.go
+++ b/maintner/maintnerd/apipb/api.pb.go
@@ -19,7 +19,7 @@
 
 import (
 	context "context"
-	grpc "go4.org/grpc"
+	grpc "grpc.go4.org"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/maintner/maintnerd/apipb/apipb.go b/maintner/maintnerd/apipb/apipb.go
index 18067c6..d4e420c 100644
--- a/maintner/maintnerd/apipb/apipb.go
+++ b/maintner/maintnerd/apipb/apipb.go
@@ -7,6 +7,6 @@
 // Run "go generate" in this directory to update. You need to have:
 //
 // - a protoc binary (see https://github.com/golang/protobuf#installation)
-// - go get go4.org/grpc-codegen/protoc-gen-go4grpc
+// - go get grpc-codegen.go4.org/protoc-gen-go4grpc
 
 //go:generate protoc --proto_path=$GOPATH/src:. --go4grpc_out=plugins=grpc:. api.proto
diff --git a/maintner/maintnerd/maintnerd.go b/maintner/maintnerd/maintnerd.go
index 6a65e10..b957fb1 100644
--- a/maintner/maintnerd/maintnerd.go
+++ b/maintner/maintnerd/maintnerd.go
@@ -27,7 +27,6 @@
 
 	"cloud.google.com/go/compute/metadata"
 	"cloud.google.com/go/storage"
-	"go4.org/grpc"
 	"golang.org/x/build/autocertcache"
 	"golang.org/x/build/gerrit"
 	"golang.org/x/build/maintner"
@@ -35,6 +34,7 @@
 	"golang.org/x/build/maintner/maintnerd/apipb"
 	"golang.org/x/crypto/acme/autocert"
 	"golang.org/x/net/http2"
+	"grpc.go4.org"
 )
 
 var (
diff --git a/maintner/maintpb/maintpb.go b/maintner/maintpb/maintpb.go
index 6951b85..ae5bb60 100644
--- a/maintner/maintpb/maintpb.go
+++ b/maintner/maintpb/maintpb.go
@@ -7,7 +7,7 @@
 // Run "go generate" in this directory to update. You need to:
 //
 // - have the protoc binary in your $PATH
-// - go get go4.org/grpc-codegen/protoc-gen-go4grpc
+// - go get grpc-codegen.go4.org/protoc-gen-go4grpc
 //
 // See https://github.com/golang/protobuf#installation for how to install
 // the protoc binary.
diff --git a/maintner/maintq/maintq.go b/maintner/maintq/maintq.go
index c228f50..7a6e85f 100644
--- a/maintner/maintq/maintq.go
+++ b/maintner/maintq/maintq.go
@@ -14,9 +14,9 @@
 	"net/http"
 	"strings"
 
-	"go4.org/grpc"
 	"golang.org/x/build/maintner/maintnerd/apipb"
 	"golang.org/x/net/http2"
+	"grpc.go4.org"
 )
 
 var (