diff --git a/authority/provisioner/webhook.go b/authority/provisioner/webhook.go
index 1e08b8b7..05f972fe 100644
--- a/authority/provisioner/webhook.go
+++ b/authority/provisioner/webhook.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/smallstep/certificates/internal/requestid"
+	"github.com/smallstep/certificates/middleware/requestid"
 	"github.com/smallstep/certificates/templates"
 	"github.com/smallstep/certificates/webhook"
 	"go.step.sm/linkedca"
diff --git a/authority/provisioner/webhook_test.go b/authority/provisioner/webhook_test.go
index 90583418..75dd0793 100644
--- a/authority/provisioner/webhook_test.go
+++ b/authority/provisioner/webhook_test.go
@@ -24,7 +24,7 @@ import (
 	"go.step.sm/crypto/x509util"
 	"go.step.sm/linkedca"
 
-	"github.com/smallstep/certificates/internal/requestid"
+	"github.com/smallstep/certificates/middleware/requestid"
 	"github.com/smallstep/certificates/webhook"
 )
 
diff --git a/ca/ca.go b/ca/ca.go
index 6967ede9..8f60dc2c 100644
--- a/ca/ca.go
+++ b/ca/ca.go
@@ -29,8 +29,8 @@ import (
 	"github.com/smallstep/certificates/cas/apiv1"
 	"github.com/smallstep/certificates/db"
 	"github.com/smallstep/certificates/internal/metrix"
-	"github.com/smallstep/certificates/internal/requestid"
 	"github.com/smallstep/certificates/logging"
+	"github.com/smallstep/certificates/middleware/requestid"
 	"github.com/smallstep/certificates/monitoring"
 	"github.com/smallstep/certificates/scep"
 	scepAPI "github.com/smallstep/certificates/scep/api"
diff --git a/logging/handler.go b/logging/handler.go
index 06fc56d3..701d631a 100644
--- a/logging/handler.go
+++ b/logging/handler.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/smallstep/certificates/internal/requestid"
 	"github.com/smallstep/certificates/internal/userid"
+	"github.com/smallstep/certificates/middleware/requestid"
 )
 
 // LoggerHandler creates a logger handler
diff --git a/internal/requestid/requestid.go b/middleware/requestid/requestid.go
similarity index 100%
rename from internal/requestid/requestid.go
rename to middleware/requestid/requestid.go
diff --git a/internal/requestid/requestid_test.go b/middleware/requestid/requestid_test.go
similarity index 100%
rename from internal/requestid/requestid_test.go
rename to middleware/requestid/requestid_test.go
diff --git a/monitoring/monitoring.go b/monitoring/monitoring.go
index 2ca2ef54..1b679bdf 100644
--- a/monitoring/monitoring.go
+++ b/monitoring/monitoring.go
@@ -10,8 +10,8 @@ import (
 	"github.com/newrelic/go-agent/v3/newrelic"
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/certificates/internal/requestid"
 	"github.com/smallstep/certificates/logging"
+	"github.com/smallstep/certificates/middleware/requestid"
 )
 
 // Middleware is a function returns another http.Handler that wraps the given