diff --git a/cmd/main.go b/cmd/main.go
index 67222df..5c44309 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -4,10 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/joho/godotenv"
-	"github.com/kagent-dev/tools/internal/version"
-	"github.com/kagent-dev/tools/pkg/logger"
-	"github.com/kagent-dev/tools/pkg/utils"
 	"net/http"
 	"os"
 	"os/signal"
@@ -16,6 +12,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/joho/godotenv"
+	"github.com/kagent-dev/tools/internal/version"
+	"github.com/kagent-dev/tools/pkg/logger"
+	"github.com/kagent-dev/tools/pkg/utils"
+
 	"github.com/kagent-dev/tools/pkg/argo"
 	"github.com/kagent-dev/tools/pkg/cilium"
 	"github.com/kagent-dev/tools/pkg/helm"
@@ -90,7 +91,7 @@ func run(cmd *cobra.Command, args []string) {
 	signal.Notify(signalChan, os.Interrupt, syscall.SIGTERM)
 
 	// HTTP server reference (only used when not in stdio mode)
-	var sseServer *server.SSEServer
+	var sseServer *server.StreamableHTTPServer
 
 	// Start server based on chosen mode
 	wg.Add(1)
@@ -100,7 +101,7 @@ func run(cmd *cobra.Command, args []string) {
 			runStdioServer(ctx, mcp)
 		}()
 	} else {
-		sseServer = server.NewSSEServer(mcp)
+		sseServer = server.NewStreamableHTTPServer(mcp)
 		go func() {
 			defer wg.Done()
 			addr := fmt.Sprintf(":%d", port)