diff --git a/app/cli/cmd/artifact_download.go b/app/cli/cmd/artifact_download.go
index 7f91984f0..93f0deb14 100644
--- a/app/cli/cmd/artifact_download.go
+++ b/app/cli/cmd/artifact_download.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"errors"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
@@ -39,7 +39,7 @@ func newArtifactDownloadCmd() *cobra.Command {
 			}
 
 			// Retrieve temporary credentials for uploading
-			artifactCASConn, err = wrappedArtifactConn(actionOpts.CPConnection,
+			artifactCASConn, err = wrappedArtifactConn(ActionOpts.CPConnection,
 				pb.CASCredentialsServiceGetRequest_ROLE_DOWNLOADER, digest)
 			if err != nil {
 				return err
@@ -49,7 +49,7 @@ func newArtifactDownloadCmd() *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts := &action.ArtifactDownloadOpts{
-				ActionsOpts:      actionOpts,
+				ActionsOpts:      ActionOpts,
 				ArtifactsCASConn: artifactCASConn,
 				Stdout:           cmd.OutOrStdout(),
 			}
diff --git a/app/cli/cmd/artifact_upload.go b/app/cli/cmd/artifact_upload.go
index a91ba7278..2b13dd927 100644
--- a/app/cli/cmd/artifact_upload.go
+++ b/app/cli/cmd/artifact_upload.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
@@ -33,7 +33,7 @@ func newArtifactUploadCmd() *cobra.Command {
 			var err error
 
 			// Retrieve temporary credentials for uploading
-			artifactCASConn, err = wrappedArtifactConn(actionOpts.CPConnection, pb.CASCredentialsServiceGetRequest_ROLE_UPLOADER, "")
+			artifactCASConn, err = wrappedArtifactConn(ActionOpts.CPConnection, pb.CASCredentialsServiceGetRequest_ROLE_UPLOADER, "")
 			if err != nil {
 				return err
 			}
@@ -42,7 +42,7 @@ func newArtifactUploadCmd() *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts := &action.ArtifactUploadOpts{
-				ActionsOpts:      actionOpts,
+				ActionsOpts:      ActionOpts,
 				ArtifactsCASConn: artifactCASConn,
 			}
 
diff --git a/app/cli/cmd/attached_integration_add.go b/app/cli/cmd/attached_integration_add.go
index de53f78f0..9bb7d753c 100644
--- a/app/cli/cmd/attached_integration_add.go
+++ b/app/cli/cmd/attached_integration_add.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -36,13 +36,13 @@ func newAttachedIntegrationAttachCmd() *cobra.Command {
   chainloop integration attached add --workflow deadbeef --project my-project --integration dependency-track --opt projectName=MyProject --opt filter="environment=prod,team=security"`,
 		RunE: func(_ *cobra.Command, _ []string) error {
 			// Find the integration to extract the kind of integration we care about
-			integration, err := action.NewRegisteredIntegrationDescribe(actionOpts).Run(integrationName)
+			integration, err := action.NewRegisteredIntegrationDescribe(ActionOpts).Run(integrationName)
 			if err != nil {
 				return err
 			}
 
 			// Retrieve schema for validation and options marshaling
-			item, err := action.NewAvailableIntegrationDescribe(actionOpts).Run(integration.Kind)
+			item, err := action.NewAvailableIntegrationDescribe(ActionOpts).Run(integration.Kind)
 			if err != nil {
 				return err
 			}
@@ -57,7 +57,7 @@ func newAttachedIntegrationAttachCmd() *cobra.Command {
 				return err
 			}
 
-			res, err := action.NewAttachedIntegrationAdd(actionOpts).Run(integrationName, workflowName, projectName, opts)
+			res, err := action.NewAttachedIntegrationAdd(ActionOpts).Run(integrationName, workflowName, projectName, opts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/attached_integration_delete.go b/app/cli/cmd/attached_integration_delete.go
index 8bfc250f4..6b95e32b0 100644
--- a/app/cli/cmd/attached_integration_delete.go
+++ b/app/cli/cmd/attached_integration_delete.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ func newAttachedIntegrationDeleteCmd() *cobra.Command {
 		Aliases: []string{"detach"},
 		Short:   "Detach an integration that's attached to a workflow",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := action.NewAttachedIntegrationDelete(actionOpts).Run(attachmentID); err != nil {
+			if err := action.NewAttachedIntegrationDelete(ActionOpts).Run(attachmentID); err != nil {
 				return err
 			}
 
diff --git a/app/cli/cmd/attached_integration_list.go b/app/cli/cmd/attached_integration_list.go
index 3232ea593..a62b929df 100644
--- a/app/cli/cmd/attached_integration_list.go
+++ b/app/cli/cmd/attached_integration_list.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/maps"
@@ -34,7 +34,7 @@ func newAttachedIntegrationListCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List integrations attached to workflows",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewAttachedIntegrationList(actionOpts).Run(projectName, workflowName)
+			res, err := action.NewAttachedIntegrationList(ActionOpts).Run(projectName, workflowName)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/attestation_add.go b/app/cli/cmd/attestation_add.go
index c22ea374e..f08b4f24a 100644
--- a/app/cli/cmd/attestation_add.go
+++ b/app/cli/cmd/attestation_add.go
@@ -27,7 +27,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
 	"github.com/chainloop-dev/chainloop/pkg/resourceloader"
 )
@@ -68,7 +68,7 @@ func newAttestationAddCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			a, err := action.NewAttestationAdd(
 				&action.AttestationAddOpts{
-					ActionsOpts:        actionOpts,
+					ActionsOpts:        ActionOpts,
 					CASURI:             viper.GetString(confOptions.CASAPI.viperKey),
 					CASCAPath:          viper.GetString(confOptions.CASCA.viperKey),
 					ConnectionInsecure: apiInsecure(),
diff --git a/app/cli/cmd/attestation_init.go b/app/cli/cmd/attestation_init.go
index ca3c2874f..8cc30c763 100644
--- a/app/cli/cmd/attestation_init.go
+++ b/app/cli/cmd/attestation_init.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -72,7 +72,7 @@ func newAttestationInitCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			a, err := action.NewAttestationInit(
 				&action.AttestationInitOpts{
-					ActionsOpts:    actionOpts,
+					ActionsOpts:    ActionOpts,
 					DryRun:         attestationDryRun,
 					Force:          force,
 					UseRemoteState: useAttestationRemoteState,
@@ -112,7 +112,7 @@ func newAttestationInitCmd() *cobra.Command {
 			logger.Info().Msg("Attestation initialized! now you can check its status or add materials to it")
 
 			// Show the status information
-			statusAction, err := action.NewAttestationStatus(&action.AttestationStatusOpts{ActionsOpts: actionOpts, UseAttestationRemoteState: useAttestationRemoteState, LocalStatePath: attestationLocalStatePath})
+			statusAction, err := action.NewAttestationStatus(&action.AttestationStatusOpts{ActionsOpts: ActionOpts, UseAttestationRemoteState: useAttestationRemoteState, LocalStatePath: attestationLocalStatePath})
 			if err != nil {
 				return newGracefulError(err)
 			}
diff --git a/app/cli/cmd/attestation_push.go b/app/cli/cmd/attestation_push.go
index 117eed628..06e0a77be 100644
--- a/app/cli/cmd/attestation_push.go
+++ b/app/cli/cmd/attestation_push.go
@@ -25,7 +25,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 )
 
 func newAttestationPushCmd() *cobra.Command {
@@ -68,7 +68,7 @@ func newAttestationPushCmd() *cobra.Command {
 				return fmt.Errorf("getting executable information: %w", err)
 			}
 			a, err := action.NewAttestationPush(&action.AttestationPushOpts{
-				ActionsOpts: actionOpts, KeyPath: pkPath, BundlePath: bundle,
+				ActionsOpts: ActionOpts, KeyPath: pkPath, BundlePath: bundle,
 				CLIVersion: info.Version, CLIDigest: info.Digest,
 				LocalStatePath: attestationLocalStatePath,
 				SignServerOpts: &action.SignServerOpts{
diff --git a/app/cli/cmd/attestation_reset.go b/app/cli/cmd/attestation_reset.go
index cc5a5df29..1b0a338aa 100644
--- a/app/cli/cmd/attestation_reset.go
+++ b/app/cli/cmd/attestation_reset.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -41,7 +41,7 @@ func newAttestationResetCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			a, err := action.NewAttestationReset(&action.AttestationResetOpts{ActionsOpts: actionOpts, LocalStatePath: attestationLocalStatePath})
+			a, err := action.NewAttestationReset(&action.AttestationResetOpts{ActionsOpts: ActionOpts, LocalStatePath: attestationLocalStatePath})
 			if err != nil {
 				return fmt.Errorf("failed to load action: %w", err)
 			}
diff --git a/app/cli/cmd/attestation_status.go b/app/cli/cmd/attestation_status.go
index da4281468..af57f3904 100644
--- a/app/cli/cmd/attestation_status.go
+++ b/app/cli/cmd/attestation_status.go
@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 )
 
@@ -46,7 +46,7 @@ func newAttestationStatusCmd() *cobra.Command {
 			a, err := action.NewAttestationStatus(
 				&action.AttestationStatusOpts{
 					UseAttestationRemoteState: attestationID != "",
-					ActionsOpts:               actionOpts,
+					ActionsOpts:               ActionOpts,
 					LocalStatePath:            attestationLocalStatePath,
 				},
 			)
diff --git a/app/cli/cmd/attestation_status_test.go b/app/cli/cmd/attestation_status_test.go
index 29d71d8aa..4f119fff5 100644
--- a/app/cli/cmd/attestation_status_test.go
+++ b/app/cli/cmd/attestation_status_test.go
@@ -17,7 +17,7 @@ package cmd
 import (
 	"testing"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/app/cli/cmd/attestation_verify.go b/app/cli/cmd/attestation_verify.go
index 2ac74fc7f..0c28d372b 100644
--- a/app/cli/cmd/attestation_verify.go
+++ b/app/cli/cmd/attestation_verify.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -35,14 +35,14 @@ func newAttestationVerifyCmd() *cobra.Command {
   # verify an attestation stored in an https endpoint
   chainloop attestation verify -b https://myrepository/attestation.json`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			res, err := action.NewAttestationVerifyAction(actionOpts).Run(cmd.Context(), fileOrURL)
+			res, err := action.NewAttestationVerifyAction(ActionOpts).Run(cmd.Context(), fileOrURL)
 			if err != nil {
 				return fmt.Errorf("verifying attestation: %w", err)
 			}
 			if res {
-				actionOpts.Logger.Info().Msg("attestation verified successfully")
+				ActionOpts.Logger.Info().Msg("attestation verified successfully")
 			} else {
-				actionOpts.Logger.Warn().Msg("attestation couldn't be verified")
+				ActionOpts.Logger.Warn().Msg("attestation couldn't be verified")
 			}
 
 			return nil
diff --git a/app/cli/cmd/auth_delete_account.go b/app/cli/cmd/auth_delete_account.go
index d1f5a4fa2..982066d13 100644
--- a/app/cli/cmd/auth_delete_account.go
+++ b/app/cli/cmd/auth_delete_account.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -31,7 +31,7 @@ func newAuthDeleteAccountCmd() *cobra.Command {
 		Short: "delete your account",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Get user information to make sure the user knows the account she is deleting
-			contextResp, err := action.NewConfigCurrentContext(actionOpts).Run()
+			contextResp, err := action.NewConfigCurrentContext(ActionOpts).Run()
 			if err != nil {
 				return err
 			}
@@ -44,7 +44,7 @@ func newAuthDeleteAccountCmd() *cobra.Command {
 			}
 
 			// Account deletion
-			if err := action.NewDeleteAccount(actionOpts).Run(); err != nil {
+			if err := action.NewDeleteAccount(ActionOpts).Run(); err != nil {
 				return err
 			}
 
diff --git a/app/cli/cmd/auth_login.go b/app/cli/cmd/auth_login.go
index 81ef365d6..7d65ecf14 100644
--- a/app/cli/cmd/auth_login.go
+++ b/app/cli/cmd/auth_login.go
@@ -187,7 +187,7 @@ func openbrowser(url string) error {
 
 // Retrieve loginURL from the control plane
 func retrieveLoginURL() (string, error) {
-	client := pb.NewStatusServiceClient(actionOpts.CPConnection)
+	client := pb.NewStatusServiceClient(ActionOpts.CPConnection)
 	resp, err := client.Infoz(context.Background(), &pb.InfozRequest{})
 	if err != nil {
 		return "", err
diff --git a/app/cli/cmd/available_integration_describe.go b/app/cli/cmd/available_integration_describe.go
index 68ca78b70..7ec1fea20 100644
--- a/app/cli/cmd/available_integration_describe.go
+++ b/app/cli/cmd/available_integration_describe.go
@@ -22,7 +22,7 @@ import (
 	"sort"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/jedib0t/go-pretty/v6/text"
@@ -36,7 +36,7 @@ func newAvailableIntegrationDescribeCmd() *cobra.Command {
 		Use:   "describe",
 		Short: "Describe integration",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			item, err := action.NewAvailableIntegrationDescribe(actionOpts).Run(integrationName)
+			item, err := action.NewAvailableIntegrationDescribe(ActionOpts).Run(integrationName)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/available_integration_list.go b/app/cli/cmd/available_integration_list.go
index 3948c6725..76cb86481 100644
--- a/app/cli/cmd/available_integration_list.go
+++ b/app/cli/cmd/available_integration_list.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -31,7 +31,7 @@ func newAvailableIntegrationListCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List available integrations",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewAvailableIntegrationList(actionOpts).Run()
+			res, err := action.NewAvailableIntegrationList(ActionOpts).Run()
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/casbackend.go b/app/cli/cmd/casbackend.go
index 3d6eaa5a6..5d755bf48 100644
--- a/app/cli/cmd/casbackend.go
+++ b/app/cli/cmd/casbackend.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
diff --git a/app/cli/cmd/casbackend_add_azureblob.go b/app/cli/cmd/casbackend_add_azureblob.go
index d69368890..e1041e2c2 100644
--- a/app/cli/cmd/casbackend_add_azureblob.go
+++ b/app/cli/cmd/casbackend_add_azureblob.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/pkg/blobmanager/azureblob"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
@@ -43,7 +43,7 @@ func newCASBackendAddAzureBlobStorageCmd() *cobra.Command {
 			cobra.CheckErr(err)
 
 			if isDefault {
-				if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, ""); err != nil {
+				if confirmed, err := confirmDefaultCASBackendOverride(ActionOpts, ""); err != nil {
 					return err
 				} else if !confirmed {
 					log.Info("Aborting...")
@@ -64,7 +64,7 @@ func newCASBackendAddAzureBlobStorageCmd() *cobra.Command {
 				Default: isDefault,
 			}
 
-			res, err := action.NewCASBackendAdd(actionOpts).Run(opts)
+			res, err := action.NewCASBackendAdd(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/casbackend_add_oci.go b/app/cli/cmd/casbackend_add_oci.go
index eee9c75df..e6e45f120 100644
--- a/app/cli/cmd/casbackend_add_oci.go
+++ b/app/cli/cmd/casbackend_add_oci.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
 )
@@ -40,7 +40,7 @@ func newCASBackendAddOCICmd() *cobra.Command {
 			cobra.CheckErr(err)
 
 			if isDefault {
-				if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, ""); err != nil {
+				if confirmed, err := confirmDefaultCASBackendOverride(ActionOpts, ""); err != nil {
 					return err
 				} else if !confirmed {
 					log.Info("Aborting...")
@@ -59,7 +59,7 @@ func newCASBackendAddOCICmd() *cobra.Command {
 				Default: isDefault,
 			}
 
-			res, err := action.NewCASBackendAdd(actionOpts).Run(opts)
+			res, err := action.NewCASBackendAdd(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/casbackend_add_s3.go b/app/cli/cmd/casbackend_add_s3.go
index cfab425bf..be8b22a2a 100644
--- a/app/cli/cmd/casbackend_add_s3.go
+++ b/app/cli/cmd/casbackend_add_s3.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/pkg/blobmanager/s3"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
@@ -41,7 +41,7 @@ func newCASBackendAddAWSS3Cmd() *cobra.Command {
 			cobra.CheckErr(err)
 
 			if isDefault {
-				if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, ""); err != nil {
+				if confirmed, err := confirmDefaultCASBackendOverride(ActionOpts, ""); err != nil {
 					return err
 				} else if !confirmed {
 					log.Info("Aborting...")
@@ -68,7 +68,7 @@ func newCASBackendAddAWSS3Cmd() *cobra.Command {
 				Default: isDefault,
 			}
 
-			res, err := action.NewCASBackendAdd(actionOpts).Run(opts)
+			res, err := action.NewCASBackendAdd(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/casbackend_delete.go b/app/cli/cmd/casbackend_delete.go
index 32ea58464..b241d7326 100644
--- a/app/cli/cmd/casbackend_delete.go
+++ b/app/cli/cmd/casbackend_delete.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
 )
@@ -29,14 +29,14 @@ func newCASBackendDeleteCmd() *cobra.Command {
 		Aliases: []string{"rm"},
 		Short:   "Delete a CAS Backend from your organization",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if confirmed, err := confirmDefaultCASBackendRemoval(actionOpts, name); err != nil {
+			if confirmed, err := confirmDefaultCASBackendRemoval(ActionOpts, name); err != nil {
 				return err
 			} else if !confirmed {
 				log.Info("Aborting...")
 				return nil
 			}
 
-			if err := action.NewCASBackendDelete(actionOpts).Run(name); err != nil {
+			if err := action.NewCASBackendDelete(ActionOpts).Run(name); err != nil {
 				return err
 			}
 
diff --git a/app/cli/cmd/casbackend_list.go b/app/cli/cmd/casbackend_list.go
index 0c259c7a9..63f5bcc23 100644
--- a/app/cli/cmd/casbackend_list.go
+++ b/app/cli/cmd/casbackend_list.go
@@ -22,7 +22,7 @@ import (
 
 	"code.cloudfoundry.org/bytefmt"
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/muesli/reflow/wrap"
 	"github.com/spf13/cobra"
@@ -34,7 +34,7 @@ func newCASBackendListCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List CAS Backends from your organization",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewCASBackendList(actionOpts).Run()
+			res, err := action.NewCASBackendList(ActionOpts).Run()
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/casbackend_update_azureblob.go b/app/cli/cmd/casbackend_update_azureblob.go
index b67ddceb9..9da4171e6 100644
--- a/app/cli/cmd/casbackend_update_azureblob.go
+++ b/app/cli/cmd/casbackend_update_azureblob.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
 )
@@ -34,7 +34,7 @@ func newCASBackendUpdateAzureBlobCmd() *cobra.Command {
 			}
 
 			// If we are overriding/unsetting the default we ask for confirmation
-			if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
+			if ok, err := handleDefaultUpdateConfirmation(ActionOpts, backendName); err != nil {
 				return err
 			} else if !ok {
 				log.Info("Aborting...")
@@ -57,7 +57,7 @@ func newCASBackendUpdateAzureBlobCmd() *cobra.Command {
 				opts.Credentials = nil
 			}
 
-			res, err := action.NewCASBackendUpdate(actionOpts).Run(opts)
+			res, err := action.NewCASBackendUpdate(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/casbackend_update_inline.go b/app/cli/cmd/casbackend_update_inline.go
index ef96ee1d4..a2d38f50f 100644
--- a/app/cli/cmd/casbackend_update_inline.go
+++ b/app/cli/cmd/casbackend_update_inline.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
 )
@@ -34,7 +34,7 @@ func newCASBackendUpdateInlineCmd() *cobra.Command {
 			}
 
 			// If we are overriding/unsetting the default we ask for confirmation
-			if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
+			if ok, err := handleDefaultUpdateConfirmation(ActionOpts, backendName); err != nil {
 				return err
 			} else if !ok {
 				log.Info("Aborting...")
@@ -47,7 +47,7 @@ func newCASBackendUpdateInlineCmd() *cobra.Command {
 				Default:     isDefaultCASBackendUpdateOption,
 			}
 
-			res, err := action.NewCASBackendUpdate(actionOpts).Run(opts)
+			res, err := action.NewCASBackendUpdate(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/casbackend_update_oci.go b/app/cli/cmd/casbackend_update_oci.go
index 1cae0e07b..5ff2798eb 100644
--- a/app/cli/cmd/casbackend_update_oci.go
+++ b/app/cli/cmd/casbackend_update_oci.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
 )
@@ -34,7 +34,7 @@ func newCASBackendUpdateOCICmd() *cobra.Command {
 			}
 
 			// If we are overriding/unsetting the default we ask for confirmation
-			if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
+			if ok, err := handleDefaultUpdateConfirmation(ActionOpts, backendName); err != nil {
 				return err
 			} else if !ok {
 				log.Info("Aborting...")
@@ -55,7 +55,7 @@ func newCASBackendUpdateOCICmd() *cobra.Command {
 				opts.Credentials = nil
 			}
 
-			res, err := action.NewCASBackendUpdate(actionOpts).Run(opts)
+			res, err := action.NewCASBackendUpdate(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/casbackend_update_s3.go b/app/cli/cmd/casbackend_update_s3.go
index 583171b70..cdfcd33c7 100644
--- a/app/cli/cmd/casbackend_update_s3.go
+++ b/app/cli/cmd/casbackend_update_s3.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/spf13/cobra"
 )
@@ -34,7 +34,7 @@ func newCASBackendUpdateAWSS3Cmd() *cobra.Command {
 			}
 
 			// If we are overriding/unsetting the default we ask for confirmation
-			if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
+			if ok, err := handleDefaultUpdateConfirmation(ActionOpts, backendName); err != nil {
 				return err
 			} else if !ok {
 				log.Info("Aborting...")
@@ -57,7 +57,7 @@ func newCASBackendUpdateAWSS3Cmd() *cobra.Command {
 				opts.Credentials = nil
 			}
 
-			res, err := action.NewCASBackendUpdate(actionOpts).Run(opts)
+			res, err := action.NewCASBackendUpdate(ActionOpts).Run(opts)
 			if err != nil {
 				return err
 			} else if res == nil {
diff --git a/app/cli/cmd/organization_apitoken_create.go b/app/cli/cmd/organization_apitoken_create.go
index de922abb4..7be6ed9f0 100644
--- a/app/cli/cmd/organization_apitoken_create.go
+++ b/app/cli/cmd/organization_apitoken_create.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -41,7 +41,7 @@ func newAPITokenCreateCmd() *cobra.Command {
 				duration = &expiresIn
 			}
 
-			res, err := action.NewAPITokenCreate(actionOpts).Run(context.Background(), name, description, projectName, duration)
+			res, err := action.NewAPITokenCreate(ActionOpts).Run(context.Background(), name, description, projectName, duration)
 			if err != nil {
 				return fmt.Errorf("creating API token: %w", err)
 			}
diff --git a/app/cli/cmd/organization_apitoken_list.go b/app/cli/cmd/organization_apitoken_list.go
index 3ce1f0b20..aa62c4086 100644
--- a/app/cli/cmd/organization_apitoken_list.go
+++ b/app/cli/cmd/organization_apitoken_list.go
@@ -21,7 +21,7 @@ import (
 	"slices"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -49,7 +49,7 @@ func newAPITokenListCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewAPITokenList(actionOpts).Run(context.Background(), includeRevoked, project, scope)
+			res, err := action.NewAPITokenList(ActionOpts).Run(context.Background(), includeRevoked, project, scope)
 			if err != nil {
 				return fmt.Errorf("listing API tokens: %w", err)
 			}
diff --git a/app/cli/cmd/organization_apitoken_revoke.go b/app/cli/cmd/organization_apitoken_revoke.go
index cb5d820c9..e9d3d22f4 100644
--- a/app/cli/cmd/organization_apitoken_revoke.go
+++ b/app/cli/cmd/organization_apitoken_revoke.go
@@ -19,7 +19,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -30,7 +30,7 @@ func newAPITokenRevokeCmd() *cobra.Command {
 		Use:   "revoke",
 		Short: "revoke API token",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := action.NewAPITokenRevoke(actionOpts).Run(context.Background(), id); err != nil {
+			if err := action.NewAPITokenRevoke(ActionOpts).Run(context.Background(), id); err != nil {
 				return fmt.Errorf("revoking API token: %w", err)
 			}
 
diff --git a/app/cli/cmd/organization_create.go b/app/cli/cmd/organization_create.go
index 3fa87bb8e..fe85df94e 100644
--- a/app/cli/cmd/organization_create.go
+++ b/app/cli/cmd/organization_create.go
@@ -19,7 +19,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -30,7 +30,7 @@ func newOrganizationCreateCmd() *cobra.Command {
 		Use:   "create",
 		Short: "Create an organization",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			org, err := action.NewOrgCreate(actionOpts).Run(context.Background(), name)
+			org, err := action.NewOrgCreate(ActionOpts).Run(context.Background(), name)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/organization_delete.go b/app/cli/cmd/organization_delete.go
index d8e127ffc..20ead3adb 100644
--- a/app/cli/cmd/organization_delete.go
+++ b/app/cli/cmd/organization_delete.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -39,7 +39,7 @@ func newOrganizationDeleteCmd() *cobra.Command {
 				return err
 			}
 
-			if err := action.NewOrganizationDelete(actionOpts).Run(ctx, orgName); err != nil {
+			if err := action.NewOrganizationDelete(ActionOpts).Run(ctx, orgName); err != nil {
 				return fmt.Errorf("deleting organization: %w", err)
 			}
 
diff --git a/app/cli/cmd/organization_describe.go b/app/cli/cmd/organization_describe.go
index 858acf6b7..a48a6d7c6 100644
--- a/app/cli/cmd/organization_describe.go
+++ b/app/cli/cmd/organization_describe.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -31,7 +31,7 @@ func newOrganizationDescribeCmd() *cobra.Command {
 		Aliases: []string{"current-context"},
 		Short:   "Describe the current organization",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewConfigCurrentContext(actionOpts).Run()
+			res, err := action.NewConfigCurrentContext(ActionOpts).Run()
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/organization_invitation_create.go b/app/cli/cmd/organization_invitation_create.go
index 5bc964e5c..442074a20 100644
--- a/app/cli/cmd/organization_invitation_create.go
+++ b/app/cli/cmd/organization_invitation_create.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -42,7 +42,7 @@ func newOrganizationInvitationCreateCmd() *cobra.Command {
 				return fmt.Errorf("role %q is not available. Available roles are %s", role, action.AvailableRoles)
 			}
 
-			res, err := action.NewOrgInvitationCreate(actionOpts).Run(
+			res, err := action.NewOrgInvitationCreate(ActionOpts).Run(
 				context.Background(), receiverEmail, role)
 			if err != nil {
 				return err
diff --git a/app/cli/cmd/organization_invitation_list_sent.go b/app/cli/cmd/organization_invitation_list_sent.go
index 147f32ddc..95c24663b 100644
--- a/app/cli/cmd/organization_invitation_list_sent.go
+++ b/app/cli/cmd/organization_invitation_list_sent.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -32,7 +32,7 @@ func newOrganizationInvitationListSentCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List sent invitations",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewOrgInvitationListSent(actionOpts).Run(context.Background())
+			res, err := action.NewOrgInvitationListSent(ActionOpts).Run(context.Background())
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/organization_invitation_revoke.go b/app/cli/cmd/organization_invitation_revoke.go
index b917c6a3e..774d5c86b 100644
--- a/app/cli/cmd/organization_invitation_revoke.go
+++ b/app/cli/cmd/organization_invitation_revoke.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"context"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ func newOrganizationInvitationRevokeCmd() *cobra.Command {
 		Use:   "revoke",
 		Short: "Revoke a pending invitation",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := action.NewOrgInvitationRevoke(actionOpts).Run(context.Background(), invitationID); err != nil {
+			if err := action.NewOrgInvitationRevoke(ActionOpts).Run(context.Background(), invitationID); err != nil {
 				return err
 			}
 
diff --git a/app/cli/cmd/organization_leave.go b/app/cli/cmd/organization_leave.go
index 4b21bd5be..f5a21cd94 100644
--- a/app/cli/cmd/organization_leave.go
+++ b/app/cli/cmd/organization_leave.go
@@ -19,13 +19,13 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
 // Get the membership entry associated to the current user for the given organization
 func membershipFromOrg(ctx context.Context, name string) (*action.MembershipItem, error) {
-	memberships, err := action.NewMembershipList(actionOpts).ListOrgs(ctx)
+	memberships, err := action.NewMembershipList(ActionOpts).ListOrgs(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("listing memberships: %w", err)
 	}
@@ -62,7 +62,7 @@ func newOrganizationLeaveCmd() *cobra.Command {
 			}
 
 			// Membership deletion
-			if err := action.NewMembershipLeave(actionOpts).Run(ctx, membership.ID); err != nil {
+			if err := action.NewMembershipLeave(ActionOpts).Run(ctx, membership.ID); err != nil {
 				return fmt.Errorf("deleting membership: %w", err)
 			}
 
diff --git a/app/cli/cmd/organization_list.go b/app/cli/cmd/organization_list.go
index dc20c6aec..4658953ae 100644
--- a/app/cli/cmd/organization_list.go
+++ b/app/cli/cmd/organization_list.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -34,7 +34,7 @@ func newOrganizationList() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List the organizations this user has access to",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewMembershipList(actionOpts).ListOrgs(cmd.Context())
+			res, err := action.NewMembershipList(ActionOpts).ListOrgs(cmd.Context())
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/organization_member_delete.go b/app/cli/cmd/organization_member_delete.go
index bbfcc228c..82d58c9e1 100644
--- a/app/cli/cmd/organization_member_delete.go
+++ b/app/cli/cmd/organization_member_delete.go
@@ -19,13 +19,13 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
 // Get the membership entry associated to the current user for the given organization
 func loadMembershipCurrentOrg(ctx context.Context, membershipID string) (*action.MembershipItem, error) {
-	res, err := action.NewMembershipList(actionOpts).ListMembers(ctx, 1, 1, &action.ListMembersOpts{MembershipID: &membershipID})
+	res, err := action.NewMembershipList(ActionOpts).ListMembers(ctx, 1, 1, &action.ListMembersOpts{MembershipID: &membershipID})
 	if err != nil {
 		return nil, fmt.Errorf("listing memberships: %w", err)
 	}
@@ -59,7 +59,7 @@ func newOrganizationMemberDeleteCmd() *cobra.Command {
 				return err
 			}
 
-			if err := action.NewMembershipDelete(actionOpts).Run(ctx, membershipID); err != nil {
+			if err := action.NewMembershipDelete(ActionOpts).Run(ctx, membershipID); err != nil {
 				return err
 			}
 
diff --git a/app/cli/cmd/organization_member_list.go b/app/cli/cmd/organization_member_list.go
index 714fc9d89..7c1ea0f69 100644
--- a/app/cli/cmd/organization_member_list.go
+++ b/app/cli/cmd/organization_member_list.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
@@ -79,7 +79,7 @@ func newOrganizationMemberList() *cobra.Command {
 				opts.Role = &role
 			}
 
-			res, err := action.NewMembershipList(actionOpts).ListMembers(cmd.Context(), paginationOpts.Page, paginationOpts.Limit, opts)
+			res, err := action.NewMembershipList(ActionOpts).ListMembers(cmd.Context(), paginationOpts.Page, paginationOpts.Limit, opts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/organization_member_update.go b/app/cli/cmd/organization_member_update.go
index f5575e041..b5e38a091 100644
--- a/app/cli/cmd/organization_member_update.go
+++ b/app/cli/cmd/organization_member_update.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -42,7 +42,7 @@ func newOrganizationMemberUpdateCmd() *cobra.Command {
 				return fmt.Errorf("role %q is not available. Available roles are %s", role, action.AvailableRoles)
 			}
 
-			res, err := action.NewMembershipUpdate(actionOpts).ChangeRole(cmd.Context(), membershipID, role)
+			res, err := action.NewMembershipUpdate(ActionOpts).ChangeRole(cmd.Context(), membershipID, role)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/organization_set.go b/app/cli/cmd/organization_set.go
index 976efaed0..58149c5ae 100644
--- a/app/cli/cmd/organization_set.go
+++ b/app/cli/cmd/organization_set.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -55,7 +55,7 @@ func newOrganizationSet() *cobra.Command {
 			// change the state server side
 			if setDefault {
 				var err error
-				membership, err = action.NewMembershipSet(actionOpts).Run(ctx, membership.ID)
+				membership, err = action.NewMembershipSet(ActionOpts).Run(ctx, membership.ID)
 				if err != nil {
 					return err
 				}
diff --git a/app/cli/cmd/organization_update.go b/app/cli/cmd/organization_update.go
index 84d9d1241..cd7ab368d 100644
--- a/app/cli/cmd/organization_update.go
+++ b/app/cli/cmd/organization_update.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -40,7 +40,7 @@ func newOrganizationUpdateCmd() *cobra.Command {
 				opts.PoliciesAllowedHostnames = &policiesAllowedHostnames
 			}
 
-			_, err := action.NewOrgUpdate(actionOpts).Run(cmd.Context(), orgName, opts)
+			_, err := action.NewOrgUpdate(ActionOpts).Run(cmd.Context(), orgName, opts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/output/output.go b/app/cli/cmd/output/output.go
index 826ae77da..bb46a31dc 100644
--- a/app/cli/cmd/output/output.go
+++ b/app/cli/cmd/output/output.go
@@ -22,7 +22,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
diff --git a/app/cli/cmd/plugins.go b/app/cli/cmd/plugins.go
index cc3fa73c0..98f2050c9 100644
--- a/app/cli/cmd/plugins.go
+++ b/app/cli/cmd/plugins.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/app/cli/pkg/plugins"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
@@ -120,7 +120,7 @@ func createPluginCommand(_ *cobra.Command, plugin *plugins.LoadedPlugin, cmdInfo
 			}
 
 			// execute plugin command using the action pattern
-			result, err := action.NewPluginExec(actionOpts, pluginManager).Run(ctx, plugin.Metadata.Name, cmdInfo.Name, config)
+			result, err := action.NewPluginExec(ActionOpts, pluginManager).Run(ctx, plugin.Metadata.Name, cmdInfo.Name, config)
 			if err != nil {
 				return fmt.Errorf("failed to execute plugin command: %w", err)
 			}
@@ -170,7 +170,7 @@ func newPluginListCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List installed plugins",
 		RunE: func(_ *cobra.Command, _ []string) error {
-			result, err := action.NewPluginList(actionOpts, pluginManager).Run(context.Background())
+			result, err := action.NewPluginList(ActionOpts, pluginManager).Run(context.Background())
 			if err != nil {
 				return err
 			}
@@ -215,7 +215,7 @@ func newPluginDescribeCmd() *cobra.Command {
 				return fmt.Errorf("plugin name is required")
 			}
 
-			result, err := action.NewPluginDescribe(actionOpts, pluginManager).Run(context.Background(), pluginName)
+			result, err := action.NewPluginDescribe(ActionOpts, pluginManager).Run(context.Background(), pluginName)
 			if err != nil {
 				return err
 			}
@@ -268,7 +268,7 @@ func newPluginInstallCmd() *cobra.Command {
 				Location: location,
 			}
 
-			result, err := action.NewPluginInstall(actionOpts, pluginManager).Run(ctx, opts)
+			result, err := action.NewPluginInstall(ActionOpts, pluginManager).Run(ctx, opts)
 			if err != nil {
 				return fmt.Errorf("failed to install plugin: %w", err)
 			}
diff --git a/app/cli/cmd/policy_develop_eval.go b/app/cli/cmd/policy_develop_eval.go
index e47df5fe8..027ae5907 100644
--- a/app/cli/cmd/policy_develop_eval.go
+++ b/app/cli/cmd/policy_develop_eval.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
 	"github.com/spf13/cobra"
 )
@@ -56,7 +56,7 @@ evaluates the policy against the provided material or attestation.`,
 				Debug:            debug,
 			}
 
-			policyEval, err := action.NewPolicyEval(opts, actionOpts)
+			policyEval, err := action.NewPolicyEval(opts, ActionOpts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/policy_develop_init.go b/app/cli/cmd/policy_develop_init.go
index 03d6e826f..77bdb93ed 100644
--- a/app/cli/cmd/policy_develop_init.go
+++ b/app/cli/cmd/policy_develop_init.go
@@ -18,7 +18,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -54,7 +54,7 @@ By default, it creates chainloop-policy.yaml and chainloop-policy.rego files.`,
 				Directory:   directory,
 			}
 
-			policyInit, err := action.NewPolicyInit(opts, actionOpts)
+			policyInit, err := action.NewPolicyInit(opts, ActionOpts)
 			if err != nil {
 				return fmt.Errorf("failed to initialize policy: %w", err)
 			}
diff --git a/app/cli/cmd/policy_develop_lint.go b/app/cli/cmd/policy_develop_lint.go
index 15398c86c..b04a3d2c3 100644
--- a/app/cli/cmd/policy_develop_lint.go
+++ b/app/cli/cmd/policy_develop_lint.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -39,7 +39,7 @@ func newPolicyDevelopLintCmd() *cobra.Command {
 - *.yaml files (schema validation)
 - *.rego (formatting, linting, structure)`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			a, err := action.NewPolicyLint(actionOpts)
+			a, err := action.NewPolicyLint(ActionOpts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/referrer_discover.go b/app/cli/cmd/referrer_discover.go
index c1e66af15..768169ed2 100644
--- a/app/cli/cmd/referrer_discover.go
+++ b/app/cli/cmd/referrer_discover.go
@@ -19,7 +19,7 @@ import (
 	"context"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -35,9 +35,9 @@ func newReferrerDiscoverCmd() *cobra.Command {
 			var err error
 
 			if fromPublicIndex {
-				res, err = action.NewReferrerDiscoverPublicIndex(actionOpts).Run(context.Background(), digest, kind)
+				res, err = action.NewReferrerDiscoverPublicIndex(ActionOpts).Run(context.Background(), digest, kind)
 			} else {
-				res, err = action.NewReferrerDiscoverPrivate(actionOpts).Run(context.Background(), digest, kind)
+				res, err = action.NewReferrerDiscoverPrivate(ActionOpts).Run(context.Background(), digest, kind)
 			}
 
 			if err != nil {
diff --git a/app/cli/cmd/registered_integration_add.go b/app/cli/cmd/registered_integration_add.go
index 484f50e0b..0c43eed74 100644
--- a/app/cli/cmd/registered_integration_add.go
+++ b/app/cli/cmd/registered_integration_add.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
 	"github.com/santhosh-tekuri/jsonschema/v5"
 	"github.com/spf13/cobra"
@@ -39,7 +39,7 @@ func newRegisteredIntegrationAddCmd() *cobra.Command {
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Retrieve schema for validation and options marshaling
-			item, err := action.NewAvailableIntegrationDescribe(actionOpts).Run(args[0])
+			item, err := action.NewAvailableIntegrationDescribe(ActionOpts).Run(args[0])
 			if err != nil {
 				return err
 			}
@@ -58,7 +58,7 @@ func newRegisteredIntegrationAddCmd() *cobra.Command {
 				return err
 			}
 
-			res, err := action.NewRegisteredIntegrationAdd(actionOpts).Run(args[0], integrationName, integrationDescription, opts)
+			res, err := action.NewRegisteredIntegrationAdd(ActionOpts).Run(args[0], integrationName, integrationDescription, opts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/registered_integration_delete.go b/app/cli/cmd/registered_integration_delete.go
index 724d7ac5a..bc2bed99e 100644
--- a/app/cli/cmd/registered_integration_delete.go
+++ b/app/cli/cmd/registered_integration_delete.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -26,7 +26,7 @@ func newRegisteredIntegrationDeleteCmd() *cobra.Command {
 		Use:   "delete",
 		Short: "De-register an integration",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := action.NewRegisteredIntegrationDelete(actionOpts).Run(name); err != nil {
+			if err := action.NewRegisteredIntegrationDelete(ActionOpts).Run(name); err != nil {
 				return err
 			}
 
diff --git a/app/cli/cmd/registered_integration_list.go b/app/cli/cmd/registered_integration_list.go
index 987e79daa..7f2e69c40 100644
--- a/app/cli/cmd/registered_integration_list.go
+++ b/app/cli/cmd/registered_integration_list.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -32,7 +32,7 @@ func newRegisteredIntegrationListCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List registered integrations",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewRegisteredIntegrationList(actionOpts).Run()
+			res, err := action.NewRegisteredIntegrationList(ActionOpts).Run()
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/root.go b/app/cli/cmd/root.go
index 5013e9e39..1f9340efb 100644
--- a/app/cli/cmd/root.go
+++ b/app/cli/cmd/root.go
@@ -27,10 +27,10 @@ import (
 	"time"
 
 	"github.com/adrg/xdg"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/telemetry"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/telemetry/posthog"
 	token "github.com/chainloop-dev/chainloop/app/cli/internal/token"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/app/cli/pkg/plugins"
 	v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	"github.com/chainloop-dev/chainloop/pkg/grpcconn"
@@ -44,7 +44,7 @@ var (
 	flagCfgFile        string
 	flagDebug          bool
 	flagOutputFormat   string
-	actionOpts         *action.ActionsOpts
+	ActionOpts         *action.ActionsOpts
 	logger             zerolog.Logger
 	defaultCPAPI       = "api.cp.chainloop.dev:443"
 	defaultCASAPI      = "api.cas.chainloop.dev:443"
@@ -87,17 +87,7 @@ func Execute(rootCmd *cobra.Command) error {
 	return nil
 }
 
-type RootCmd struct {
-	*cobra.Command
-	// ActionOpts is a pointer-to-pointer to the global actionOpts variable.
-	// This allows the RootCmd to reference the global state that gets initialized
-	// in PersistentPreRunE and used across all subcommands. The double indirection
-	// ensures that when the global actionOpts is updated (e.g., with new connection),
-	// all references automatically point to the updated value.
-	ActionOpts **action.ActionsOpts
-}
-
-func NewRootCmd(l zerolog.Logger) *RootCmd {
+func NewRootCmd(l zerolog.Logger) *cobra.Command {
 	rootCmd := &cobra.Command{
 		Use:           appName,
 		Short:         "Chainloop Command Line Interface",
@@ -165,7 +155,7 @@ func NewRootCmd(l zerolog.Logger) *RootCmd {
 				return err
 			}
 
-			actionOpts = newActionOpts(logger, conn, authToken)
+			ActionOpts = newActionOpts(logger, conn, authToken)
 
 			if !isTelemetryDisabled() {
 				logger.Debug().Msg("Telemetry enabled, to disable it use DO_NOT_TRACK=1")
@@ -208,7 +198,7 @@ func NewRootCmd(l zerolog.Logger) *RootCmd {
 			return nil
 		},
 		PersistentPostRunE: func(_ *cobra.Command, _ []string) error {
-			return cleanup(actionOpts.CPConnection)
+			return cleanup(ActionOpts.CPConnection)
 		},
 	}
 
@@ -269,7 +259,7 @@ func NewRootCmd(l zerolog.Logger) *RootCmd {
 		}
 	}
 
-	return &RootCmd{Command: rootCmd, ActionOpts: &actionOpts}
+	return rootCmd
 }
 
 // this could have been done using automatic + prefix but we want to have control and know the values
@@ -349,7 +339,7 @@ func initConfigFile() {
 }
 
 func newActionOpts(logger zerolog.Logger, conn *grpc.ClientConn, token string) *action.ActionsOpts {
-	return &action.ActionsOpts{CPConnection: conn, Logger: logger, AuthTokenRaw: token}
+	return &action.ActionsOpts{CPConnection: conn, Logger: logger, AuthTokenRaw: token, OutputFormat: flagOutputFormat}
 }
 
 func cleanup(conn *grpc.ClientConn) error {
diff --git a/app/cli/cmd/version.go b/app/cli/cmd/version.go
index 596ecf698..11dc6b1f9 100644
--- a/app/cli/cmd/version.go
+++ b/app/cli/cmd/version.go
@@ -50,8 +50,8 @@ func NewVersionCmd() *cobra.Command {
 				Server: "unknown",
 			}
 
-			if actionOpts.CPConnection != nil {
-				res, err := pb.NewStatusServiceClient(actionOpts.CPConnection).Infoz(context.Background(), &pb.InfozRequest{})
+			if ActionOpts.CPConnection != nil {
+				res, err := pb.NewStatusServiceClient(ActionOpts.CPConnection).Infoz(context.Background(), &pb.InfozRequest{})
 				if err == nil {
 					version.Server = res.Version
 				}
diff --git a/app/cli/cmd/workflow_contract_create.go b/app/cli/cmd/workflow_contract_create.go
index 492c97332..b9963876e 100644
--- a/app/cli/cmd/workflow_contract_create.go
+++ b/app/cli/cmd/workflow_contract_create.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -32,7 +32,7 @@ func newWorkflowContractCreateCmd() *cobra.Command {
 			if cmd.Flags().Changed("description") {
 				desc = &description
 			}
-			res, err := action.NewWorkflowContractCreate(actionOpts).Run(name, desc, contractPath, projectName)
+			res, err := action.NewWorkflowContractCreate(ActionOpts).Run(name, desc, contractPath, projectName)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_contract_delete.go b/app/cli/cmd/workflow_contract_delete.go
index 960cc3f34..5176add1d 100644
--- a/app/cli/cmd/workflow_contract_delete.go
+++ b/app/cli/cmd/workflow_contract_delete.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ func newWorkflowContractDeleteCmd() *cobra.Command {
 		Use:   "delete",
 		Short: "Delete a contract",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := action.NewWorkflowContractDelete(actionOpts).Run(name); err != nil {
+			if err := action.NewWorkflowContractDelete(ActionOpts).Run(name); err != nil {
 				return err
 			}
 			logger.Info().Msg("contract deleted!")
diff --git a/app/cli/cmd/workflow_contract_describe.go b/app/cli/cmd/workflow_contract_describe.go
index d7ad72d66..4873c55e0 100644
--- a/app/cli/cmd/workflow_contract_describe.go
+++ b/app/cli/cmd/workflow_contract_describe.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -39,7 +39,7 @@ func newWorkflowContractDescribeCmd() *cobra.Command {
 		Use:   "describe",
 		Short: "Describe the information of the contract",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewWorkflowContractDescribe(actionOpts).Run(name, revision)
+			res, err := action.NewWorkflowContractDescribe(ActionOpts).Run(name, revision)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_contract_list.go b/app/cli/cmd/workflow_contract_list.go
index d838ecdbb..eb7a925b8 100644
--- a/app/cli/cmd/workflow_contract_list.go
+++ b/app/cli/cmd/workflow_contract_list.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -30,7 +30,7 @@ func newWorkflowContractListCmd() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List contracts",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewWorkflowContractList(actionOpts).Run()
+			res, err := action.NewWorkflowContractList(ActionOpts).Run()
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_contract_update.go b/app/cli/cmd/workflow_contract_update.go
index 4414edd79..130079ff6 100644
--- a/app/cli/cmd/workflow_contract_update.go
+++ b/app/cli/cmd/workflow_contract_update.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -42,7 +42,7 @@ func newWorkflowContractUpdateCmd() *cobra.Command {
 				desc = &description
 			}
 
-			res, err := action.NewWorkflowContractUpdate(actionOpts).Run(name, desc, contractPath)
+			res, err := action.NewWorkflowContractUpdate(ActionOpts).Run(name, desc, contractPath)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_create.go b/app/cli/cmd/workflow_create.go
index c0700a11f..03b775c0a 100644
--- a/app/cli/cmd/workflow_create.go
+++ b/app/cli/cmd/workflow_create.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -60,7 +60,7 @@ func newWorkflowCreateCmd() *cobra.Command {
 				}
 			}
 
-			wf, err := action.NewWorkflowCreate(actionOpts).Run(opts)
+			wf, err := action.NewWorkflowCreate(ActionOpts).Run(opts)
 			if err != nil {
 				if s, ok := status.FromError(err); ok {
 					if s.Code() == codes.AlreadyExists {
diff --git a/app/cli/cmd/workflow_delete.go b/app/cli/cmd/workflow_delete.go
index f0dd12ccc..34beecda8 100644
--- a/app/cli/cmd/workflow_delete.go
+++ b/app/cli/cmd/workflow_delete.go
@@ -16,7 +16,7 @@
 package cmd
 
 import (
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ func newWorkflowDeleteCmd() *cobra.Command {
 		Use:   "delete",
 		Short: "Delete an existing workflow",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			err := action.NewWorkflowDelete(actionOpts).Run(name, projectName)
+			err := action.NewWorkflowDelete(ActionOpts).Run(name, projectName)
 			if err == nil {
 				logger.Info().Msg("Workflow deleted!")
 			}
diff --git a/app/cli/cmd/workflow_describe.go b/app/cli/cmd/workflow_describe.go
index bd527ef85..c42cddad9 100644
--- a/app/cli/cmd/workflow_describe.go
+++ b/app/cli/cmd/workflow_describe.go
@@ -17,7 +17,7 @@ package cmd
 
 import (
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ func newWorkflowDescribeCmd() *cobra.Command {
 		Use:   "describe",
 		Short: "Describe an existing workflow",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			wf, err := action.NewWorkflowDescribe(actionOpts).Run(cmd.Context(), workflowName, projectName)
+			wf, err := action.NewWorkflowDescribe(ActionOpts).Run(cmd.Context(), workflowName, projectName)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_list.go b/app/cli/cmd/workflow_list.go
index 049585b6c..b2d51d538 100644
--- a/app/cli/cmd/workflow_list.go
+++ b/app/cli/cmd/workflow_list.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -56,7 +56,7 @@ func newWorkflowListCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(_ *cobra.Command, _ []string) error {
-			res, err := action.NewWorkflowList(actionOpts).Run(paginationOpts.Page, paginationOpts.Limit)
+			res, err := action.NewWorkflowList(ActionOpts).Run(paginationOpts.Page, paginationOpts.Limit)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_update.go b/app/cli/cmd/workflow_update.go
index 96f4e5a60..965f78532 100644
--- a/app/cli/cmd/workflow_update.go
+++ b/app/cli/cmd/workflow_update.go
@@ -19,7 +19,7 @@ import (
 	"context"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/spf13/cobra"
 )
 
@@ -47,7 +47,7 @@ func newWorkflowUpdateCmd() *cobra.Command {
 				opts.ContractName = &contractName
 			}
 
-			res, err := action.NewWorkflowUpdate(actionOpts).Run(context.Background(), name, project, opts)
+			res, err := action.NewWorkflowUpdate(ActionOpts).Run(context.Background(), name, project, opts)
 			if err != nil {
 				return err
 			}
diff --git a/app/cli/cmd/workflow_workflow_run_describe.go b/app/cli/cmd/workflow_workflow_run_describe.go
index f2f4568b4..1a3171b10 100644
--- a/app/cli/cmd/workflow_workflow_run_describe.go
+++ b/app/cli/cmd/workflow_workflow_run_describe.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/jedib0t/go-pretty/v6/text"
@@ -68,7 +68,7 @@ func newWorkflowWorkflowRunDescribeCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewWorkflowRunDescribe(actionOpts).Run(context.Background(), &action.WorkflowRunDescribeOpts{
+			res, err := action.NewWorkflowRunDescribe(ActionOpts).Run(context.Background(), &action.WorkflowRunDescribeOpts{
 				RunID:         runID,
 				Digest:        attestationDigest,
 				PublicKeyRef:  publicKey,
diff --git a/app/cli/cmd/workflow_workflow_run_describe_test.go b/app/cli/cmd/workflow_workflow_run_describe_test.go
index 04b57d1e7..ef9ca4929 100644
--- a/app/cli/cmd/workflow_workflow_run_describe_test.go
+++ b/app/cli/cmd/workflow_workflow_run_describe_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/base64"
 	"testing"
 
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/app/cli/cmd/workflow_workflow_run_list.go b/app/cli/cmd/workflow_workflow_run_list.go
index 467ac4ed7..4e67a3640 100644
--- a/app/cli/cmd/workflow_workflow_run_list.go
+++ b/app/cli/cmd/workflow_workflow_run_list.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -47,7 +47,7 @@ func newWorkflowWorkflowRunListCmd() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewWorkflowRunList(actionOpts).Run(
+			res, err := action.NewWorkflowRunList(ActionOpts).Run(
 				&action.WorkflowRunListOpts{
 					WorkflowName: workflowName,
 					ProjectName:  projectName,
diff --git a/app/cli/main.go b/app/cli/main.go
index 19a5eed13..9189df0bc 100644
--- a/app/cli/main.go
+++ b/app/cli/main.go
@@ -35,7 +35,7 @@ func main() {
 	// Couldn't find an easier way to disable the timestamp
 	logger := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, FormatTimestamp: func(interface{}) string { return "" }})
 	rootCmd := cmd.NewRootCmd(logger)
-	if err := cmd.Execute(rootCmd.Command); err != nil {
+	if err := cmd.Execute(rootCmd); err != nil {
 		msg, exitCode := errorInfo(err, logger)
 		logger.Error().Msg(msg)
 		os.Exit(exitCode)
diff --git a/app/cli/internal/action/action.go b/app/cli/pkg/action/action.go
similarity index 99%
rename from app/cli/internal/action/action.go
rename to app/cli/pkg/action/action.go
index f16c965e2..9f3e7f4b6 100644
--- a/app/cli/internal/action/action.go
+++ b/app/cli/pkg/action/action.go
@@ -38,6 +38,7 @@ type ActionsOpts struct {
 	CPConnection *grpc.ClientConn
 	Logger       zerolog.Logger
 	AuthTokenRaw string
+	OutputFormat string
 }
 
 type OffsetPagination struct {
diff --git a/app/cli/internal/action/apitoken_create.go b/app/cli/pkg/action/apitoken_create.go
similarity index 100%
rename from app/cli/internal/action/apitoken_create.go
rename to app/cli/pkg/action/apitoken_create.go
diff --git a/app/cli/internal/action/apitoken_list.go b/app/cli/pkg/action/apitoken_list.go
similarity index 100%
rename from app/cli/internal/action/apitoken_list.go
rename to app/cli/pkg/action/apitoken_list.go
diff --git a/app/cli/internal/action/apitoken_revoke.go b/app/cli/pkg/action/apitoken_revoke.go
similarity index 100%
rename from app/cli/internal/action/apitoken_revoke.go
rename to app/cli/pkg/action/apitoken_revoke.go
diff --git a/app/cli/internal/action/artifact_download.go b/app/cli/pkg/action/artifact_download.go
similarity index 100%
rename from app/cli/internal/action/artifact_download.go
rename to app/cli/pkg/action/artifact_download.go
diff --git a/app/cli/internal/action/artifact_upload.go b/app/cli/pkg/action/artifact_upload.go
similarity index 100%
rename from app/cli/internal/action/artifact_upload.go
rename to app/cli/pkg/action/artifact_upload.go
diff --git a/app/cli/internal/action/attached_integration_add.go b/app/cli/pkg/action/attached_integration_add.go
similarity index 100%
rename from app/cli/internal/action/attached_integration_add.go
rename to app/cli/pkg/action/attached_integration_add.go
diff --git a/app/cli/internal/action/attached_integration_delete.go b/app/cli/pkg/action/attached_integration_delete.go
similarity index 100%
rename from app/cli/internal/action/attached_integration_delete.go
rename to app/cli/pkg/action/attached_integration_delete.go
diff --git a/app/cli/internal/action/attached_integration_list.go b/app/cli/pkg/action/attached_integration_list.go
similarity index 100%
rename from app/cli/internal/action/attached_integration_list.go
rename to app/cli/pkg/action/attached_integration_list.go
diff --git a/app/cli/internal/action/attestation_add.go b/app/cli/pkg/action/attestation_add.go
similarity index 100%
rename from app/cli/internal/action/attestation_add.go
rename to app/cli/pkg/action/attestation_add.go
diff --git a/app/cli/internal/action/attestation_init.go b/app/cli/pkg/action/attestation_init.go
similarity index 100%
rename from app/cli/internal/action/attestation_init.go
rename to app/cli/pkg/action/attestation_init.go
diff --git a/app/cli/internal/action/attestation_init_test.go b/app/cli/pkg/action/attestation_init_test.go
similarity index 100%
rename from app/cli/internal/action/attestation_init_test.go
rename to app/cli/pkg/action/attestation_init_test.go
diff --git a/app/cli/internal/action/attestation_push.go b/app/cli/pkg/action/attestation_push.go
similarity index 100%
rename from app/cli/internal/action/attestation_push.go
rename to app/cli/pkg/action/attestation_push.go
diff --git a/app/cli/internal/action/attestation_reset.go b/app/cli/pkg/action/attestation_reset.go
similarity index 100%
rename from app/cli/internal/action/attestation_reset.go
rename to app/cli/pkg/action/attestation_reset.go
diff --git a/app/cli/internal/action/attestation_status.go b/app/cli/pkg/action/attestation_status.go
similarity index 100%
rename from app/cli/internal/action/attestation_status.go
rename to app/cli/pkg/action/attestation_status.go
diff --git a/app/cli/internal/action/attestation_status_test.go b/app/cli/pkg/action/attestation_status_test.go
similarity index 100%
rename from app/cli/internal/action/attestation_status_test.go
rename to app/cli/pkg/action/attestation_status_test.go
diff --git a/app/cli/internal/action/attestation_verify.go b/app/cli/pkg/action/attestation_verify.go
similarity index 100%
rename from app/cli/internal/action/attestation_verify.go
rename to app/cli/pkg/action/attestation_verify.go
diff --git a/app/cli/internal/action/available_integration_describe.go b/app/cli/pkg/action/available_integration_describe.go
similarity index 100%
rename from app/cli/internal/action/available_integration_describe.go
rename to app/cli/pkg/action/available_integration_describe.go
diff --git a/app/cli/internal/action/available_integration_list.go b/app/cli/pkg/action/available_integration_list.go
similarity index 100%
rename from app/cli/internal/action/available_integration_list.go
rename to app/cli/pkg/action/available_integration_list.go
diff --git a/app/cli/internal/action/casbackend_add.go b/app/cli/pkg/action/casbackend_add.go
similarity index 100%
rename from app/cli/internal/action/casbackend_add.go
rename to app/cli/pkg/action/casbackend_add.go
diff --git a/app/cli/internal/action/casbackend_delete.go b/app/cli/pkg/action/casbackend_delete.go
similarity index 100%
rename from app/cli/internal/action/casbackend_delete.go
rename to app/cli/pkg/action/casbackend_delete.go
diff --git a/app/cli/internal/action/casbackend_list.go b/app/cli/pkg/action/casbackend_list.go
similarity index 100%
rename from app/cli/internal/action/casbackend_list.go
rename to app/cli/pkg/action/casbackend_list.go
diff --git a/app/cli/internal/action/casbackend_update.go b/app/cli/pkg/action/casbackend_update.go
similarity index 100%
rename from app/cli/internal/action/casbackend_update.go
rename to app/cli/pkg/action/casbackend_update.go
diff --git a/app/cli/internal/action/config_current_context.go b/app/cli/pkg/action/config_current_context.go
similarity index 100%
rename from app/cli/internal/action/config_current_context.go
rename to app/cli/pkg/action/config_current_context.go
diff --git a/app/cli/internal/action/delete_account.go b/app/cli/pkg/action/delete_account.go
similarity index 100%
rename from app/cli/internal/action/delete_account.go
rename to app/cli/pkg/action/delete_account.go
diff --git a/app/cli/internal/action/membership_delete.go b/app/cli/pkg/action/membership_delete.go
similarity index 100%
rename from app/cli/internal/action/membership_delete.go
rename to app/cli/pkg/action/membership_delete.go
diff --git a/app/cli/internal/action/membership_leave.go b/app/cli/pkg/action/membership_leave.go
similarity index 100%
rename from app/cli/internal/action/membership_leave.go
rename to app/cli/pkg/action/membership_leave.go
diff --git a/app/cli/internal/action/membership_list.go b/app/cli/pkg/action/membership_list.go
similarity index 100%
rename from app/cli/internal/action/membership_list.go
rename to app/cli/pkg/action/membership_list.go
diff --git a/app/cli/internal/action/membership_set.go b/app/cli/pkg/action/membership_set.go
similarity index 100%
rename from app/cli/internal/action/membership_set.go
rename to app/cli/pkg/action/membership_set.go
diff --git a/app/cli/internal/action/membership_update.go b/app/cli/pkg/action/membership_update.go
similarity index 100%
rename from app/cli/internal/action/membership_update.go
rename to app/cli/pkg/action/membership_update.go
diff --git a/app/cli/internal/action/org_create.go b/app/cli/pkg/action/org_create.go
similarity index 100%
rename from app/cli/internal/action/org_create.go
rename to app/cli/pkg/action/org_create.go
diff --git a/app/cli/internal/action/org_invitation_create.go b/app/cli/pkg/action/org_invitation_create.go
similarity index 100%
rename from app/cli/internal/action/org_invitation_create.go
rename to app/cli/pkg/action/org_invitation_create.go
diff --git a/app/cli/internal/action/org_invitation_list_sent.go b/app/cli/pkg/action/org_invitation_list_sent.go
similarity index 100%
rename from app/cli/internal/action/org_invitation_list_sent.go
rename to app/cli/pkg/action/org_invitation_list_sent.go
diff --git a/app/cli/internal/action/org_invitation_revoke.go b/app/cli/pkg/action/org_invitation_revoke.go
similarity index 100%
rename from app/cli/internal/action/org_invitation_revoke.go
rename to app/cli/pkg/action/org_invitation_revoke.go
diff --git a/app/cli/internal/action/org_update.go b/app/cli/pkg/action/org_update.go
similarity index 100%
rename from app/cli/internal/action/org_update.go
rename to app/cli/pkg/action/org_update.go
diff --git a/app/cli/internal/action/organization_delete.go b/app/cli/pkg/action/organization_delete.go
similarity index 100%
rename from app/cli/internal/action/organization_delete.go
rename to app/cli/pkg/action/organization_delete.go
diff --git a/app/cli/internal/action/plugin_actions.go b/app/cli/pkg/action/plugin_actions.go
similarity index 100%
rename from app/cli/internal/action/plugin_actions.go
rename to app/cli/pkg/action/plugin_actions.go
diff --git a/app/cli/internal/action/policy_develop_eval.go b/app/cli/pkg/action/policy_develop_eval.go
similarity index 100%
rename from app/cli/internal/action/policy_develop_eval.go
rename to app/cli/pkg/action/policy_develop_eval.go
diff --git a/app/cli/internal/action/policy_develop_init.go b/app/cli/pkg/action/policy_develop_init.go
similarity index 100%
rename from app/cli/internal/action/policy_develop_init.go
rename to app/cli/pkg/action/policy_develop_init.go
diff --git a/app/cli/internal/action/policy_develop_lint.go b/app/cli/pkg/action/policy_develop_lint.go
similarity index 100%
rename from app/cli/internal/action/policy_develop_lint.go
rename to app/cli/pkg/action/policy_develop_lint.go
diff --git a/app/cli/internal/action/referrer_discover.go b/app/cli/pkg/action/referrer_discover.go
similarity index 100%
rename from app/cli/internal/action/referrer_discover.go
rename to app/cli/pkg/action/referrer_discover.go
diff --git a/app/cli/internal/action/registered_integration_add.go b/app/cli/pkg/action/registered_integration_add.go
similarity index 100%
rename from app/cli/internal/action/registered_integration_add.go
rename to app/cli/pkg/action/registered_integration_add.go
diff --git a/app/cli/internal/action/registered_integration_delete.go b/app/cli/pkg/action/registered_integration_delete.go
similarity index 100%
rename from app/cli/internal/action/registered_integration_delete.go
rename to app/cli/pkg/action/registered_integration_delete.go
diff --git a/app/cli/internal/action/registered_integration_describe.go b/app/cli/pkg/action/registered_integration_describe.go
similarity index 100%
rename from app/cli/internal/action/registered_integration_describe.go
rename to app/cli/pkg/action/registered_integration_describe.go
diff --git a/app/cli/internal/action/registered_integration_list.go b/app/cli/pkg/action/registered_integration_list.go
similarity index 100%
rename from app/cli/internal/action/registered_integration_list.go
rename to app/cli/pkg/action/registered_integration_list.go
diff --git a/app/cli/internal/action/testdata/ca.pub b/app/cli/pkg/action/testdata/ca.pub
similarity index 100%
rename from app/cli/internal/action/testdata/ca.pub
rename to app/cli/pkg/action/testdata/ca.pub
diff --git a/app/cli/internal/action/testdata/cert-attestation.json b/app/cli/pkg/action/testdata/cert-attestation.json
similarity index 100%
rename from app/cli/internal/action/testdata/cert-attestation.json
rename to app/cli/pkg/action/testdata/cert-attestation.json
diff --git a/app/cli/internal/action/testdata/cert.pem b/app/cli/pkg/action/testdata/cert.pem
similarity index 100%
rename from app/cli/internal/action/testdata/cert.pem
rename to app/cli/pkg/action/testdata/cert.pem
diff --git a/app/cli/internal/action/testdata/cosign-attestation.json b/app/cli/pkg/action/testdata/cosign-attestation.json
similarity index 100%
rename from app/cli/internal/action/testdata/cosign-attestation.json
rename to app/cli/pkg/action/testdata/cosign-attestation.json
diff --git a/app/cli/internal/action/testdata/cosign.pub b/app/cli/pkg/action/testdata/cosign.pub
similarity index 100%
rename from app/cli/internal/action/testdata/cosign.pub
rename to app/cli/pkg/action/testdata/cosign.pub
diff --git a/app/cli/internal/action/testdata/policy_group.yaml b/app/cli/pkg/action/testdata/policy_group.yaml
similarity index 100%
rename from app/cli/internal/action/testdata/policy_group.yaml
rename to app/cli/pkg/action/testdata/policy_group.yaml
diff --git a/app/cli/internal/action/testdata/policy_group_no_name.yaml b/app/cli/pkg/action/testdata/policy_group_no_name.yaml
similarity index 100%
rename from app/cli/internal/action/testdata/policy_group_no_name.yaml
rename to app/cli/pkg/action/testdata/policy_group_no_name.yaml
diff --git a/app/cli/internal/action/testdata/policy_group_with_arguments.yaml b/app/cli/pkg/action/testdata/policy_group_with_arguments.yaml
similarity index 100%
rename from app/cli/internal/action/testdata/policy_group_with_arguments.yaml
rename to app/cli/pkg/action/testdata/policy_group_with_arguments.yaml
diff --git a/app/cli/internal/action/util.go b/app/cli/pkg/action/util.go
similarity index 100%
rename from app/cli/internal/action/util.go
rename to app/cli/pkg/action/util.go
diff --git a/app/cli/internal/action/workflow_contract_create.go b/app/cli/pkg/action/workflow_contract_create.go
similarity index 100%
rename from app/cli/internal/action/workflow_contract_create.go
rename to app/cli/pkg/action/workflow_contract_create.go
diff --git a/app/cli/internal/action/workflow_contract_delete.go b/app/cli/pkg/action/workflow_contract_delete.go
similarity index 100%
rename from app/cli/internal/action/workflow_contract_delete.go
rename to app/cli/pkg/action/workflow_contract_delete.go
diff --git a/app/cli/internal/action/workflow_contract_describe.go b/app/cli/pkg/action/workflow_contract_describe.go
similarity index 100%
rename from app/cli/internal/action/workflow_contract_describe.go
rename to app/cli/pkg/action/workflow_contract_describe.go
diff --git a/app/cli/internal/action/workflow_contract_list.go b/app/cli/pkg/action/workflow_contract_list.go
similarity index 100%
rename from app/cli/internal/action/workflow_contract_list.go
rename to app/cli/pkg/action/workflow_contract_list.go
diff --git a/app/cli/internal/action/workflow_contract_update.go b/app/cli/pkg/action/workflow_contract_update.go
similarity index 100%
rename from app/cli/internal/action/workflow_contract_update.go
rename to app/cli/pkg/action/workflow_contract_update.go
diff --git a/app/cli/internal/action/workflow_create.go b/app/cli/pkg/action/workflow_create.go
similarity index 100%
rename from app/cli/internal/action/workflow_create.go
rename to app/cli/pkg/action/workflow_create.go
diff --git a/app/cli/internal/action/workflow_delete.go b/app/cli/pkg/action/workflow_delete.go
similarity index 100%
rename from app/cli/internal/action/workflow_delete.go
rename to app/cli/pkg/action/workflow_delete.go
diff --git a/app/cli/internal/action/workflow_describe.go b/app/cli/pkg/action/workflow_describe.go
similarity index 100%
rename from app/cli/internal/action/workflow_describe.go
rename to app/cli/pkg/action/workflow_describe.go
diff --git a/app/cli/internal/action/workflow_list.go b/app/cli/pkg/action/workflow_list.go
similarity index 100%
rename from app/cli/internal/action/workflow_list.go
rename to app/cli/pkg/action/workflow_list.go
diff --git a/app/cli/internal/action/workflow_run_describe.go b/app/cli/pkg/action/workflow_run_describe.go
similarity index 100%
rename from app/cli/internal/action/workflow_run_describe.go
rename to app/cli/pkg/action/workflow_run_describe.go
diff --git a/app/cli/internal/action/workflow_run_describe_test.go b/app/cli/pkg/action/workflow_run_describe_test.go
similarity index 100%
rename from app/cli/internal/action/workflow_run_describe_test.go
rename to app/cli/pkg/action/workflow_run_describe_test.go
diff --git a/app/cli/internal/action/workflow_run_list.go b/app/cli/pkg/action/workflow_run_list.go
similarity index 100%
rename from app/cli/internal/action/workflow_run_list.go
rename to app/cli/pkg/action/workflow_run_list.go
diff --git a/app/cli/internal/action/workflow_run_list_test.go b/app/cli/pkg/action/workflow_run_list_test.go
similarity index 100%
rename from app/cli/internal/action/workflow_run_list_test.go
rename to app/cli/pkg/action/workflow_run_list_test.go
diff --git a/app/cli/internal/action/workflow_update.go b/app/cli/pkg/action/workflow_update.go
similarity index 100%
rename from app/cli/internal/action/workflow_update.go
rename to app/cli/pkg/action/workflow_update.go