diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5ef176e..3c942d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,3 +17,9 @@ jobs:
 
       - name: Test
         run: go test -v ./...
+
+      - name: Make
+        run: make
+
+      - name: Make advanced
+        run: make advanced
diff --git a/cmd/agent_admin_accept_operator.go b/cmd/agent_admin_accept_operator.go
index aa9628f..4468fd3 100644
--- a/cmd/agent_admin_accept_operator.go
+++ b/cmd/agent_admin_accept_operator.go
@@ -22,7 +22,7 @@ var acceptOperatorCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		ctx := cmd.Context()
 
-		agentAddr, auth, _, _, err := commonOwnerOrOperatorSetup(ctx, "operator")
+		agentAddr, auth, _, _, err := commonOwnerOrOperatorSetup(cmd, "operator")
 		if err != nil {
 			logFatal(err)
 		}
diff --git a/cmd/agent_admin_accept_ownership.go b/cmd/agent_admin_accept_ownership.go
index 659c374..7dcb123 100644
--- a/cmd/agent_admin_accept_ownership.go
+++ b/cmd/agent_admin_accept_ownership.go
@@ -22,7 +22,7 @@ var acceptOwnershipCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		ctx := cmd.Context()
 
-		agentAddr, auth, _, _, err := commonSetupOwnerCall()
+		agentAddr, auth, _, _, err := commonSetupOwnerCall(cmd)
 		if err != nil {
 			logFatal(err)
 		}
diff --git a/cmd/agent_admin_change_requester.go b/cmd/agent_admin_change_requester.go
index 5511e67..124c187 100644
--- a/cmd/agent_admin_change_requester.go
+++ b/cmd/agent_admin_change_requester.go
@@ -28,7 +28,7 @@ var changeRequesterCmd = &cobra.Command{
 			logFatal(err)
 		}
 
-		agentAddr, auth, _, _, err := commonSetupOwnerCall()
+		agentAddr, auth, _, _, err := commonSetupOwnerCall(cmd)
 		if err != nil {
 			logFatal(err)
 		}
diff --git a/cmd/agent_admin_transfer_operator.go b/cmd/agent_admin_transfer_operator.go
index e8b673c..7e09a4a 100644
--- a/cmd/agent_admin_transfer_operator.go
+++ b/cmd/agent_admin_transfer_operator.go
@@ -27,7 +27,7 @@ var transferOperatorCmd = &cobra.Command{
 			logFatal(err)
 		}
 
-		agentAddr, auth, _, _, err := commonSetupOwnerCall()
+		agentAddr, auth, _, _, err := commonSetupOwnerCall(cmd)
 		if err != nil {
 			logFatal(err)
 		}
diff --git a/cmd/agent_admin_transfer_ownership.go b/cmd/agent_admin_transfer_ownership.go
index f6296e8..1fd400a 100644
--- a/cmd/agent_admin_transfer_ownership.go
+++ b/cmd/agent_admin_transfer_ownership.go
@@ -27,7 +27,7 @@ var transferOwnershipCmd = &cobra.Command{
 			logFatal(err)
 		}
 
-		agentAddr, auth, _, _, err := commonSetupOwnerCall()
+		agentAddr, auth, _, _, err := commonSetupOwnerCall(cmd)
 		if err != nil {
 			logFatal(err)
 		}