diff --git a/registry/types/publisher_provided_types.go b/registry/types/publisher_provided_types.go
index 7c02ad3..c935689 100644
--- a/registry/types/publisher_provided_types.go
+++ b/registry/types/publisher_provided_types.go
@@ -4,8 +4,7 @@
 package registry
 
 import (
-	"github.com/mark3labs/mcp-go/mcp"
-
+	mcp "github.com/stacklok/toolhive-core/mcpcompat/mcp"
 	"github.com/stacklok/toolhive-core/permissions"
 )
 
diff --git a/registry/types/registry_types.go b/registry/types/registry_types.go
index 2819104..5ca50ae 100644
--- a/registry/types/registry_types.go
+++ b/registry/types/registry_types.go
@@ -8,9 +8,9 @@ import (
 	"slices"
 	"time"
 
-	"github.com/mark3labs/mcp-go/mcp"
 	"gopkg.in/yaml.v3"
 
+	mcp "github.com/stacklok/toolhive-core/mcpcompat/mcp"
 	"github.com/stacklok/toolhive-core/permissions"
 )