diff --git a/src/constants/commitlint.ts b/src/constants/commitlint.ts
index aedb466..8081543 100644
--- a/src/constants/commitlint.ts
+++ b/src/constants/commitlint.ts
@@ -1,9 +1,8 @@
 import type { PackageManager } from '@/types/package-manger'
 
-// TODO: Add configuration for yarn
 export const COMMITLINT_CONFIG: Record<PackageManager, string> = {
   npm: 'npx --no -- commitlint --edit $1',
   pnpm: 'pnpm dlx commitlint --edit $1',
-  yarn: '',
+  yarn: 'yarn dlx commitlint --edit $1',
   bun: 'bunx commitlint --edit $1'
 }
diff --git a/src/constants/lint-staged.ts b/src/constants/lint-staged.ts
index 9af0b09..aa7b823 100644
--- a/src/constants/lint-staged.ts
+++ b/src/constants/lint-staged.ts
@@ -1,9 +1,8 @@
 import type { PackageManager } from '@/types/package-manger'
 
-// TODO: Add configuration for yarn
 export const LINT_STAGED_CONFIG: Record<PackageManager, string> = {
   npm: 'npx lint-staged',
   pnpm: 'pnpm dlx lint-staged',
-  yarn: '',
+  yarn: 'yarn dlx lint-staged',
   bun: 'bunx lint-staged'
 }
diff --git a/src/utils/package-managers.ts b/src/utils/package-managers.ts
index 914c0c3..beb2d8f 100644
--- a/src/utils/package-managers.ts
+++ b/src/utils/package-managers.ts
@@ -18,9 +18,7 @@ export async function getPackageManger(): Promise<PackageManager> {
   try {
     const { packageManager } = await inquirer.prompt({
       type: 'rawlist',
-      choices: PACKAGE_MANGERS.filter(
-        packageManager => packageManager !== 'yarn'
-      ),
+      choices: PACKAGE_MANGERS,
       message: 'Which package manager do you wanna use?',
       name: 'packageManager'
     })