diff --git a/cli/sdk.go b/cli/sdk.go
index f4099115..efd26f66 100644
--- a/cli/sdk.go
+++ b/cli/sdk.go
@@ -5,6 +5,7 @@ package cli
 import (
 	"context"
 
+	"github.com/ultravioletrs/cocos/internal/server"
 	"github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"github.com/ultravioletrs/cocos/pkg/clients/grpc/agent"
 	"github.com/ultravioletrs/cocos/pkg/sdk"
@@ -14,12 +15,12 @@ var Verbose bool
 
 type CLI struct {
 	agentSDK   sdk.SDK
-	config     grpc.Config
+	config     server.AgentConfig
 	client     grpc.Client
 	connectErr error
 }
 
-func New(config grpc.Config) *CLI {
+func New(config server.AgentConfig) *CLI {
 	return &CLI{
 		config: config,
 	}
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index f21bf095..6dfe1b17 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -30,8 +30,8 @@ import (
 	ackvsock "github.com/ultravioletrs/cocos/internal/vsock"
 	managerevents "github.com/ultravioletrs/cocos/manager/events"
 	"github.com/ultravioletrs/cocos/manager/qemu"
-	grpcClient "github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
+	grpcClient "github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"golang.org/x/crypto/sha3"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
index 33413180..e445d62b 100644
--- a/cmd/cli/main.go
+++ b/cmd/cli/main.go
@@ -14,10 +14,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/ultravioletrs/cocos/cli"
-	"github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"github.com/ultravioletrs/cocos/internal/server"
-	"github.com/ultravioletrs/cocos/pkg/clients/grpc/agent"
-	"github.com/ultravioletrs/cocos/pkg/sdk"
 	cmd "github.com/virtee/sev-snp-measure-go/sevsnpmeasure/cmd"
 )
 
diff --git a/internal/server/grpc/grpc_test.go b/internal/server/grpc/grpc_test.go
index e97a733d..57df24d3 100644
--- a/internal/server/grpc/grpc_test.go
+++ b/internal/server/grpc/grpc_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	authmocks "github.com/ultravioletrs/cocos/agent/mocks"
 	"github.com/ultravioletrs/cocos/internal/server"
-	grpcClient "github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider/mocks"
+	grpcClient "github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/test/bufconn"
 )