diff --git a/cli/packages/cmd/folder.go b/cli/packages/cmd/folder.go
index 290f32c38..dc2298980 100644
--- a/cli/packages/cmd/folder.go
+++ b/cli/packages/cmd/folder.go
@@ -36,8 +36,16 @@ var getCmd = &cobra.Command{
 			}
 		}
 
-		infisicalToken, err := util.GetInfisicalServiceToken(cmd)
+		projectId, err := cmd.Flags().GetString("projectId")
+		if err != nil {
+			util.HandleError(err, "Unable to parse flag")
+		}
 
+		infisicalToken, err := util.GetInfisicalServiceToken(cmd)
+		if err != nil {
+			util.HandleError(err, "Unable to parse flag")
+		}
+		identityAccessToken, err := util.GetInfisicalUniversalAuthAccessToken(cmd)
 		if err != nil {
 			util.HandleError(err, "Unable to parse flag")
 		}
@@ -47,7 +55,7 @@ var getCmd = &cobra.Command{
 			util.HandleError(err, "Unable to parse flag")
 		}
 
-		folders, err := util.GetAllFolders(models.GetAllFoldersParameters{Environment: environmentName, InfisicalToken: infisicalToken, FoldersPath: foldersPath})
+		folders, err := util.GetAllFolders(models.GetAllFoldersParameters{Environment: environmentName, InfisicalToken: infisicalToken, UniversalAuthAccessToken: identityAccessToken, FoldersPath: foldersPath, WorkspaceId: projectId})
 		if err != nil {
 			util.HandleError(err, "Unable to get folders")
 		}