diff --git a/cli/packages/models/cli.go b/cli/packages/models/cli.go
index e197218e0..73db3d908 100644
--- a/cli/packages/models/cli.go
+++ b/cli/packages/models/cli.go
@@ -97,10 +97,11 @@ type GetAllSecretsParameters struct {
 }
 
 type GetAllFoldersParameters struct {
-	WorkspaceId    string
-	Environment    string
-	FoldersPath    string
-	InfisicalToken string
+	WorkspaceId              string
+	Environment              string
+	FoldersPath              string
+	InfisicalToken           string
+	UniversalAuthAccessToken string
 }
 
 type CreateFolderParameters struct {
@@ -123,3 +124,8 @@ type ExpandSecretsAuthentication struct {
 	InfisicalToken           string
 	UniversalAuthAccessToken string
 }
+
+type MachineIdentityCredentials struct {
+	ClientId     string
+	ClientSecret string
+}
diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go
index ee2532ee8..d4243208a 100644
--- a/cli/packages/util/constants.go
+++ b/cli/packages/util/constants.go
@@ -1,17 +1,19 @@
 package util
 
 const (
-	CONFIG_FILE_NAME                     = "infisical-config.json"
-	CONFIG_FOLDER_NAME                   = ".infisical"
-	INFISICAL_DEFAULT_API_URL            = "https://app.infisical.com/api"
-	INFISICAL_DEFAULT_URL                = "https://app.infisical.com"
-	INFISICAL_WORKSPACE_CONFIG_FILE_NAME = ".infisical.json"
-	INFISICAL_TOKEN_NAME                 = "INFISICAL_TOKEN"
-	SECRET_TYPE_PERSONAL                 = "personal"
-	SECRET_TYPE_SHARED                   = "shared"
-	KEYRING_SERVICE_NAME                 = "infisical"
-	PERSONAL_SECRET_TYPE_NAME            = "personal"
-	SHARED_SECRET_TYPE_NAME              = "shared"
+	CONFIG_FILE_NAME                       = "infisical-config.json"
+	CONFIG_FOLDER_NAME                     = ".infisical"
+	INFISICAL_DEFAULT_API_URL              = "https://app.infisical.com/api"
+	INFISICAL_DEFAULT_URL                  = "https://app.infisical.com"
+	INFISICAL_WORKSPACE_CONFIG_FILE_NAME   = ".infisical.json"
+	INFISICAL_TOKEN_NAME                   = "INFISICAL_TOKEN"
+	INFISICAL_UNIVERSAL_AUTH_CLIENT_ID     = "INFISICAL_UNIVERSAL_AUTH_CLIENT_ID"
+	INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET = "INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET"
+	SECRET_TYPE_PERSONAL                   = "personal"
+	SECRET_TYPE_SHARED                     = "shared"
+	KEYRING_SERVICE_NAME                   = "infisical"
+	PERSONAL_SECRET_TYPE_NAME              = "personal"
+	SHARED_SECRET_TYPE_NAME                = "shared"
 )
 
 var (