diff --git a/packages/composable-cli/src/commands/generate/d2c/tasks/setup.ts b/packages/composable-cli/src/commands/generate/d2c/tasks/setup.ts
index 84f01316..09a8da51 100644
--- a/packages/composable-cli/src/commands/generate/d2c/tasks/setup.ts
+++ b/packages/composable-cli/src/commands/generate/d2c/tasks/setup.ts
@@ -4,18 +4,26 @@ import { setupAccountsTask } from "./setup-accounts"
 import { createInitialCommit } from "../../utils/git-commit"
 
 export function createD2CSetupTask() {
-  return new Listr<D2CSetupTaskContext>([
-    {
-      title: "Initialize Git",
-      task: async (ctx) => {
-        if (!ctx.skipGit) {
-          await createInitialCommit(ctx.workspaceRoot)
-        }
+  return new Listr<D2CSetupTaskContext>(
+    [
+      {
+        title: "Initialize Git",
+        task: async (ctx) => {
+          if (!ctx.skipGit) {
+            await createInitialCommit(ctx.workspaceRoot)
+          }
+        },
       },
-    },
+      {
+        title: "Setup accounts",
+        task: setupAccountsTask,
+      },
+    ],
     {
-      title: "Setup accounts",
-      task: setupAccountsTask,
+      exitOnError: false,
+      rendererOptions: {
+        collapseErrors: false,
+      },
     },
-  ])
+  )
 }