diff --git a/Makefile b/Makefile
index 36110aabc..2c288e0a3 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ install-sim: ## install storj-sim
 		storj.io/storj/cmd/uplink \
 		storj.io/storj/cmd/identity \
 		storj.io/storj/cmd/certificates
-	cd cmd/gateway && go install -race -v .
+	cd cmd/gateway && go install -race -v storj.io/storj/cmd/gateway
 
 ##@ Test
 
diff --git a/cmd/gateway/go.mod b/cmd/gateway/go.mod
index 81e81f0e8..efb70218c 100644
--- a/cmd/gateway/go.mod
+++ b/cmd/gateway/go.mod
@@ -1,4 +1,4 @@
-module storj.io/redirect/gateway
+module storj.io/storj/cmd/gateway
 
 // module uses different name to make go module system treat it as a separate
 // package and make it such there isn't a cyclic dependency.
@@ -6,7 +6,9 @@ module storj.io/redirect/gateway
 go 1.13
 
 require storj.io/gateway v1.0.0-rc.2
+// keep this in sync with storj.io/gateway
+require storj.io/storj v0.12.1-0.20200224220226-50a21de9dc71
 
 exclude gopkg.in/olivere/elastic.v5 v5.0.72 // buggy import, see https://github.com/olivere/elastic/pull/869
 
-replace google.golang.org/grpc => github.com/storj/grpc-go v1.27.2-0.20200225082019-bd19b647a81c
+replace google.golang.org/grpc => github.com/storj/grpc-go v1.27.2-0.20200225082019-bd19b647a81c
\ No newline at end of file