diff --git a/pkg/certificate/authorization/authorizations.go b/certificate/authorization/authorizations.go
similarity index 100%
rename from pkg/certificate/authorization/authorizations.go
rename to certificate/authorization/authorizations.go
diff --git a/pkg/certificate/authorization/authorizations_test.go b/certificate/authorization/authorizations_test.go
similarity index 99%
rename from pkg/certificate/authorization/authorizations_test.go
rename to certificate/authorization/authorizations_test.go
index 0e55e33df..a598ce035 100644
--- a/pkg/certificate/authorization/authorizations_test.go
+++ b/certificate/authorization/authorizations_test.go
@@ -18,9 +18,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/zeebo/errs"
 
+	"storj.io/storj/certificate/certificateclient"
 	"storj.io/storj/internal/testcontext"
 	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/pkg/certificate/certificateclient"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/peertls/tlsopts"
diff --git a/pkg/certificate/authorization/db.go b/certificate/authorization/db.go
similarity index 100%
rename from pkg/certificate/authorization/db.go
rename to certificate/authorization/db.go
diff --git a/pkg/certificate/authorization/doc.go b/certificate/authorization/doc.go
similarity index 100%
rename from pkg/certificate/authorization/doc.go
rename to certificate/authorization/doc.go
diff --git a/pkg/certificate/authorization/endpoint.go b/certificate/authorization/endpoint.go
similarity index 100%
rename from pkg/certificate/authorization/endpoint.go
rename to certificate/authorization/endpoint.go
diff --git a/pkg/certificate/authorization/endpoint_test.go b/certificate/authorization/endpoint_test.go
similarity index 100%
rename from pkg/certificate/authorization/endpoint_test.go
rename to certificate/authorization/endpoint_test.go
diff --git a/pkg/certificate/authorization/service.go b/certificate/authorization/service.go
similarity index 100%
rename from pkg/certificate/authorization/service.go
rename to certificate/authorization/service.go
diff --git a/pkg/certificate/authorization/service_test.go b/certificate/authorization/service_test.go
similarity index 100%
rename from pkg/certificate/authorization/service_test.go
rename to certificate/authorization/service_test.go
diff --git a/pkg/certificate/certificateclient/client.go b/certificate/certificateclient/client.go
similarity index 100%
rename from pkg/certificate/certificateclient/client.go
rename to certificate/certificateclient/client.go
diff --git a/pkg/certificate/certificateclient/doc.go b/certificate/certificateclient/doc.go
similarity index 100%
rename from pkg/certificate/certificateclient/doc.go
rename to certificate/certificateclient/doc.go
diff --git a/pkg/certificate/doc.go b/certificate/doc.go
similarity index 100%
rename from pkg/certificate/doc.go
rename to certificate/doc.go
diff --git a/pkg/certificate/endpoint.go b/certificate/endpoint.go
similarity index 98%
rename from pkg/certificate/endpoint.go
rename to certificate/endpoint.go
index 5809d263f..0be450050 100644
--- a/pkg/certificate/endpoint.go
+++ b/certificate/endpoint.go
@@ -8,7 +8,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"storj.io/storj/pkg/certificate/authorization"
+	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/rpc/rpcpeer"
diff --git a/pkg/certificate/peer.go b/certificate/peer.go
similarity index 98%
rename from pkg/certificate/peer.go
rename to certificate/peer.go
index dd2b2c4e4..c24c21b3e 100644
--- a/pkg/certificate/peer.go
+++ b/certificate/peer.go
@@ -12,8 +12,8 @@ import (
 	"golang.org/x/sync/errgroup"
 	"gopkg.in/spacemonkeygo/monkit.v2"
 
+	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/internal/errs2"
-	"storj.io/storj/pkg/certificate/authorization"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/peertls/tlsopts"
diff --git a/pkg/certificate/peer_test.go b/certificate/peer_test.go
similarity index 97%
rename from pkg/certificate/peer_test.go
rename to certificate/peer_test.go
index 58debecf7..c04b8a8d9 100644
--- a/pkg/certificate/peer_test.go
+++ b/certificate/peer_test.go
@@ -14,11 +14,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
+	"storj.io/storj/certificate"
+	"storj.io/storj/certificate/authorization"
+	"storj.io/storj/certificate/certificateclient"
 	"storj.io/storj/internal/testcontext"
 	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/pkg/certificate"
-	"storj.io/storj/pkg/certificate/authorization"
-	"storj.io/storj/pkg/certificate/certificateclient"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/peertls/tlsopts"
diff --git a/cmd/certificates/auth.go b/cmd/certificates/auth.go
index efa33c571..3fc9139f3 100644
--- a/cmd/certificates/auth.go
+++ b/cmd/certificates/auth.go
@@ -18,7 +18,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/pkg/certificate/authorization"
+	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/pkg/process"
 )
 
diff --git a/cmd/certificates/claims.go b/cmd/certificates/claims.go
index 0a544e5d2..5bf908148 100644
--- a/cmd/certificates/claims.go
+++ b/cmd/certificates/claims.go
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/pkg/certificate/authorization"
+	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/pkg/process"
 )
 
diff --git a/cmd/certificates/main.go b/cmd/certificates/main.go
index 27cf249e6..c11f34c59 100644
--- a/cmd/certificates/main.go
+++ b/cmd/certificates/main.go
@@ -8,9 +8,9 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
+	"storj.io/storj/certificate"
+	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/internal/fpath"
-	"storj.io/storj/pkg/certificate"
-	"storj.io/storj/pkg/certificate/authorization"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
diff --git a/cmd/certificates/setup.go b/cmd/certificates/setup.go
index 2104f5e81..122b61b4e 100644
--- a/cmd/certificates/setup.go
+++ b/cmd/certificates/setup.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/internal/fpath"
-	"storj.io/storj/pkg/certificate/authorization"
 	"storj.io/storj/pkg/process"
 )
 
diff --git a/cmd/identity/main.go b/cmd/identity/main.go
index 6770965d5..d45773d28 100644
--- a/cmd/identity/main.go
+++ b/cmd/identity/main.go
@@ -14,9 +14,9 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
+	"storj.io/storj/certificate/certificateclient"
 	"storj.io/storj/internal/fpath"
 	"storj.io/storj/internal/version"
-	"storj.io/storj/pkg/certificate/certificateclient"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls/extensions"
diff --git a/scripts/check-peer-constraints.go b/scripts/check-peer-constraints.go
index a2a86d360..579ac116e 100644
--- a/scripts/check-peer-constraints.go
+++ b/scripts/check-peer-constraints.go
@@ -36,6 +36,7 @@ var Peers = []string{
 	"storj.io/storj/bootstrap/...",
 	"storj.io/storj/versioncontrol/...",
 	"storj.io/storj/linksharing/...",
+	"storj.io/storj/certificate/...",
 }
 
 var Cmds = []string{