diff --git a/go.mod b/go.mod
index d708aa1..9849693 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.9.1
 	github.com/streamnative/pulsarctl v0.4.3-0.20250312214758-e472faec284b
-	github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve v0.0.0-00010101000000-000000000000
+	github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver v0.0.0-20250506174209-b67ea08ddd82
 	github.com/streamnative/streamnative-mcp-server/sdk/sdk-kafkaconnect v0.0.0-00010101000000-000000000000
 	github.com/twmb/franz-go v1.18.1
 	github.com/twmb/franz-go/pkg/kadm v1.16.0
@@ -83,6 +83,6 @@ require (
 	google.golang.org/protobuf v1.35.1 // indirect
 )
 
-replace github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve => ./sdk/sdk-apiserver
+replace github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver => ./sdk/sdk-apiserver
 
 replace github.com/streamnative/streamnative-mcp-server/sdk/sdk-kafkaconnect => ./sdk/sdk-kafkaconnect
diff --git a/go.work.sum b/go.work.sum
index 67ad3e6..8bed584 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -52,6 +52,10 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
+github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
+github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
@@ -92,6 +96,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
+github.com/mark3labs/mcp-go v0.23.1 h1:RzTzZ5kJ+HxwnutKA4rll8N/pKV6Wh5dhCmiJUu5S9I=
+github.com/mark3labs/mcp-go v0.23.1/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
diff --git a/pkg/config/apiclient.go b/pkg/config/apiclient.go
index 0b3e941..eb83835 100644
--- a/pkg/config/apiclient.go
+++ b/pkg/config/apiclient.go
@@ -30,7 +30,7 @@ import (
 	"github.com/streamnative/streamnative-mcp-server/pkg/auth"
 	"github.com/streamnative/streamnative-mcp-server/pkg/auth/cache"
 	"github.com/streamnative/streamnative-mcp-server/pkg/auth/store"
-	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve"
+	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver"
 )
 
 var SNCloudClientConfiguration *sncloud.Configuration
diff --git a/pkg/mcp/auth_utils.go b/pkg/mcp/auth_utils.go
index dfbb788..b3dbbdf 100644
--- a/pkg/mcp/auth_utils.go
+++ b/pkg/mcp/auth_utils.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/streamnative/streamnative-mcp-server/pkg/auth"
-	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve"
+	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver"
 )
 
 const (
diff --git a/pkg/mcp/context_utils.go b/pkg/mcp/context_utils.go
index 9587ff0..68e5ea8 100644
--- a/pkg/mcp/context_utils.go
+++ b/pkg/mcp/context_utils.go
@@ -24,7 +24,7 @@ import (
 	"github.com/streamnative/streamnative-mcp-server/pkg/config"
 	"github.com/streamnative/streamnative-mcp-server/pkg/kafka"
 	"github.com/streamnative/streamnative-mcp-server/pkg/pulsar"
-	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve"
+	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver"
 )
 
 const DefaultKafkaPort = 9093
diff --git a/pkg/mcp/prompts.go b/pkg/mcp/prompts.go
index 7f30d90..ecb60f5 100644
--- a/pkg/mcp/prompts.go
+++ b/pkg/mcp/prompts.go
@@ -25,7 +25,7 @@ import (
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 	"github.com/streamnative/streamnative-mcp-server/pkg/config"
-	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve"
+	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver"
 )
 
 func RegisterPrompts(s *server.MCPServer) {
diff --git a/pkg/mcp/utils.go b/pkg/mcp/utils.go
index de002f3..a0d0977 100644
--- a/pkg/mcp/utils.go
+++ b/pkg/mcp/utils.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/streamnative/streamnative-mcp-server/pkg/auth"
 	"github.com/streamnative/streamnative-mcp-server/pkg/config"
-	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserve"
+	sncloud "github.com/streamnative/streamnative-mcp-server/sdk/sdk-apiserver"
 )
 
 type ContextKey string