diff --git a/packages/cli/src/__tests__/fs.test.js b/packages/cli/src/__tests__/fs.test.js
index 1352240e62a9..ad793de93484 100644
--- a/packages/cli/src/__tests__/fs.test.js
+++ b/packages/cli/src/__tests__/fs.test.js
@@ -1,8 +1,9 @@
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 const INITIAL_FS = {
   file_a: 'content_a',
   [path.join('fake_dir', 'mock_dir', 'made_up_file')]: 'made_up_content',
diff --git a/packages/cli/src/__tests__/plugin.test.js b/packages/cli/src/__tests__/plugin.test.js
index 3be4cca8ec4a..692d098634af 100644
--- a/packages/cli/src/__tests__/plugin.test.js
+++ b/packages/cli/src/__tests__/plugin.test.js
@@ -1,5 +1,4 @@
-import fs from 'fs'
-
+import fs from 'fs-extra'
 import yargs from 'yargs'
 import { hideBin } from 'yargs/helpers'
 
diff --git a/packages/cli/src/commands/buildHandler.js b/packages/cli/src/commands/buildHandler.js
index a145031075bc..78787ab4ce71 100644
--- a/packages/cli/src/commands/buildHandler.js
+++ b/packages/cli/src/commands/buildHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { rimraf } from 'rimraf'
 import terminalLink from 'terminal-link'
diff --git a/packages/cli/src/commands/consoleHandler.js b/packages/cli/src/commands/consoleHandler.js
index adeb480e734d..038e9d2f3c08 100644
--- a/packages/cli/src/commands/consoleHandler.js
+++ b/packages/cli/src/commands/consoleHandler.js
@@ -1,7 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 import repl from 'repl'
 
+import fs from 'fs-extra'
+
 import { registerApiSideBabelHook } from '@redwoodjs/babel-config'
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 
diff --git a/packages/cli/src/commands/deploy/__tests__/nftPack.test.js b/packages/cli/src/commands/deploy/__tests__/nftPack.test.js
index a6840c58a84e..ab3168fab06c 100644
--- a/packages/cli/src/commands/deploy/__tests__/nftPack.test.js
+++ b/packages/cli/src/commands/deploy/__tests__/nftPack.test.js
@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { buildApi } from '@redwoodjs/internal/dist/build/api'
 import { findApiDistFunctions } from '@redwoodjs/internal/dist/files'
 
diff --git a/packages/cli/src/commands/deploy/baremetal.js b/packages/cli/src/commands/deploy/baremetal.js
index bc969e542e6a..52f3945a2b18 100644
--- a/packages/cli/src/commands/deploy/baremetal.js
+++ b/packages/cli/src/commands/deploy/baremetal.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import toml from '@iarna/toml'
 import boxen from 'boxen'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { env as envInterpolation } from 'string-env-interpolation'
 import terminalLink from 'terminal-link'
diff --git a/packages/cli/src/commands/deploy/serverless.js b/packages/cli/src/commands/deploy/serverless.js
index f9d95f5c0f96..c3fc24ab0c77 100644
--- a/packages/cli/src/commands/deploy/serverless.js
+++ b/packages/cli/src/commands/deploy/serverless.js
@@ -1,10 +1,10 @@
-import fs from 'fs'
 import path from 'path'
 
 import boxen from 'boxen'
 import chalk from 'chalk'
 import { config } from 'dotenv-defaults'
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import prompts from 'prompts'
 import terminalLink from 'terminal-link'
diff --git a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
index 4ac811b8072c..2cde53ce55a2 100644
--- a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
+++ b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js
@@ -16,7 +16,7 @@ jest.mock('@redwoodjs/structure', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/component/__tests__/component.test.js b/packages/cli/src/commands/destroy/component/__tests__/component.test.js
index cccc803db4c6..95d2013ca909 100644
--- a/packages/cli/src/commands/destroy/component/__tests__/component.test.js
+++ b/packages/cli/src/commands/destroy/component/__tests__/component.test.js
@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js b/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js
index 3078a88ab229..b1b4552b5f1e 100644
--- a/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js
+++ b/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js
@@ -8,7 +8,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/function/__tests__/function.test.js b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
index d72a403de010..fa302c5935a0 100644
--- a/packages/cli/src/commands/destroy/function/__tests__/function.test.js
+++ b/packages/cli/src/commands/destroy/function/__tests__/function.test.js
@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
index f0d970bc1d7f..751e54ceac00 100644
--- a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
+++ b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js
@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/page/__tests__/page.test.js b/packages/cli/src/commands/destroy/page/__tests__/page.test.js
index d6182d32a45a..6e2fd1e6b752 100644
--- a/packages/cli/src/commands/destroy/page/__tests__/page.test.js
+++ b/packages/cli/src/commands/destroy/page/__tests__/page.test.js
@@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => {
   }
 })
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
index 1baba32c507c..61ae251c0742 100644
--- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
@@ -1,8 +1,9 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import '../../../../lib/test'
 
 import { getPaths, getDefaultArgs } from '../../../../lib'
diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js
index ee69c8702f59..09af6b5d0c6b 100644
--- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js
+++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js
@@ -1,8 +1,9 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import '../../../../lib/test'
 
 import { getPaths, getDefaultArgs } from '../../../../lib'
diff --git a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
index 5d704f1f067c..b1577c9a0370 100644
--- a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
@@ -1,6 +1,6 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/destroy/service/__tests__/service.test.js b/packages/cli/src/commands/destroy/service/__tests__/service.test.js
index 22b59bb8d885..6973bb303a96 100644
--- a/packages/cli/src/commands/destroy/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/destroy/service/__tests__/service.test.js
@@ -1,5 +1,5 @@
 globalThis.__dirname = __dirname
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/devHandler.js b/packages/cli/src/commands/devHandler.js
index 9a80069b711f..e4ed83085460 100644
--- a/packages/cli/src/commands/devHandler.js
+++ b/packages/cli/src/commands/devHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import { argv } from 'process'
 
 import concurrently from 'concurrently'
+import fs from 'fs-extra'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { shutdownPort } from '@redwoodjs/internal/dist/dev'
diff --git a/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js b/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js
index eef9373fd67d..c0c75a5924cc 100644
--- a/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js
+++ b/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js
index 01f210a222ad..8a8f5fad08b1 100644
--- a/packages/cli/src/commands/experimental/setupRscHandler.js
+++ b/packages/cli/src/commands/experimental/setupRscHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { prettify } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/experimental/setupSentryHandler.js b/packages/cli/src/commands/experimental/setupSentryHandler.js
index dcff86f2b54e..a249a75a4188 100644
--- a/packages/cli/src/commands/experimental/setupSentryHandler.js
+++ b/packages/cli/src/commands/experimental/setupSentryHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import {
diff --git a/packages/cli/src/commands/experimental/setupServerFileHandler.js b/packages/cli/src/commands/experimental/setupServerFileHandler.js
index 33a406efed67..b6140dae8971 100644
--- a/packages/cli/src/commands/experimental/setupServerFileHandler.js
+++ b/packages/cli/src/commands/experimental/setupServerFileHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
index 9c431b5a41f7..28f8e658f982 100644
--- a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
+++ b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addWebPackages } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/experimental/studioHandler.js b/packages/cli/src/commands/experimental/studioHandler.js
index e1a7cdaf0e4f..4ca9d7000d2b 100644
--- a/packages/cli/src/commands/experimental/studioHandler.js
+++ b/packages/cli/src/commands/experimental/studioHandler.js
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import { getConfigPath } from '@redwoodjs/project-config'
 
diff --git a/packages/cli/src/commands/experimental/util.js b/packages/cli/src/commands/experimental/util.js
index ba84efad2118..d55b130e787a 100644
--- a/packages/cli/src/commands/experimental/util.js
+++ b/packages/cli/src/commands/experimental/util.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { getPaths } from '../../lib'
diff --git a/packages/cli/src/commands/generate/__tests__/helpers.test.js b/packages/cli/src/commands/generate/__tests__/helpers.test.js
index 0e2b7179cd7a..1714901af7f0 100644
--- a/packages/cli/src/commands/generate/__tests__/helpers.test.js
+++ b/packages/cli/src/commands/generate/__tests__/helpers.test.js
@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 // Setup test mocks
 globalThis.__dirname = __dirname
 import '../../../lib/test'
diff --git a/packages/cli/src/commands/generate/dataMigration/dataMigration.js b/packages/cli/src/commands/generate/dataMigration/dataMigration.js
index 20babf10228a..719272e17bcc 100644
--- a/packages/cli/src/commands/generate/dataMigration/dataMigration.js
+++ b/packages/cli/src/commands/generate/dataMigration/dataMigration.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { paramCase } from 'param-case'
 import terminalLink from 'terminal-link'
diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
index 08797506d27a..5031ad25c8a7 100644
--- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
+++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js
@@ -2,7 +2,6 @@ global.__dirname = __dirname
 
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
 // Load mocks
@@ -10,6 +9,7 @@ import '../../../../lib/test'
 
 const realfs = jest.requireActual('fs')
 import Enquirer from 'enquirer'
+import fs from 'fs-extra'
 
 import { getPaths } from '../../../../lib'
 import * as dbAuth from '../dbAuth'
diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js
index 14afe2affd7c..00924554e756 100644
--- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js
+++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import { camelCase } from 'camel-case'
 import Enquirer from 'enquirer'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import terminalLink from 'terminal-link'
 import { titleCase } from 'title-case'
diff --git a/packages/cli/src/commands/generate/helpers.js b/packages/cli/src/commands/generate/helpers.js
index c76490a62c47..e3d48ff99c7d 100644
--- a/packages/cli/src/commands/generate/helpers.js
+++ b/packages/cli/src/commands/generate/helpers.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { paramCase } from 'param-case'
 import pascalcase from 'pascalcase'
diff --git a/packages/cli/src/commands/generate/page/__tests__/page.test.js b/packages/cli/src/commands/generate/page/__tests__/page.test.js
index 3ad2e4cdfc5f..7836abe2f8dc 100644
--- a/packages/cli/src/commands/generate/page/__tests__/page.test.js
+++ b/packages/cli/src/commands/generate/page/__tests__/page.test.js
@@ -36,9 +36,10 @@ jest.mock('fs', () => {
   }
 })
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 // Load mocks
 import '../../../../lib/test'
 
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js
index 3c27756a104d..7af86d2d1794 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js
@@ -1,6 +1,6 @@
 globalThis.__dirname = __dirname
 
-import fs from 'fs'
+import fs from 'fs-extra'
 
 import '../../../../lib/test'
 import { shouldUseTailwindCSS } from '../scaffold'
diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
index ad7b72d83f03..177ef4cf7730 100644
--- a/packages/cli/src/commands/generate/scaffold/scaffold.js
+++ b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import camelcase from 'camelcase'
 import execa from 'execa'
+import fs from 'fs-extra'
 import humanize from 'humanize-string'
 import { Listr } from 'listr2'
 import { paramCase } from 'param-case'
diff --git a/packages/cli/src/commands/generate/script/script.js b/packages/cli/src/commands/generate/script/script.js
index e2ed7d8dcc64..459ec5470580 100644
--- a/packages/cli/src/commands/generate/script/script.js
+++ b/packages/cli/src/commands/generate/script/script.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import terminalLink from 'terminal-link'
 
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
index 5c426645ad9a..081aebe7ba19 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
@@ -24,9 +24,9 @@ jest.mock('fs', () => {
   }
 })
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import prompts from 'prompts'
 
 // Load mocks
diff --git a/packages/cli/src/commands/lint.js b/packages/cli/src/commands/lint.js
index e0db5812279c..c24bab90224b 100644
--- a/packages/cli/src/commands/lint.js
+++ b/packages/cli/src/commands/lint.js
@@ -1,6 +1,5 @@
-import fs from 'fs'
-
 import execa from 'execa'
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/prerenderHandler.js b/packages/cli/src/commands/prerenderHandler.js
index 2d3e09fc5000..45fdb405ac30 100644
--- a/packages/cli/src/commands/prerenderHandler.js
+++ b/packages/cli/src/commands/prerenderHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/prismaHandler.js b/packages/cli/src/commands/prismaHandler.js
index ff2884e861cd..e4b6bcf0da82 100644
--- a/packages/cli/src/commands/prismaHandler.js
+++ b/packages/cli/src/commands/prismaHandler.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import boxen from 'boxen'
 import execa from 'execa'
+import fs from 'fs-extra'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { errorTelemetry } from '@redwoodjs/telemetry'
diff --git a/packages/cli/src/commands/serve.js b/packages/cli/src/commands/serve.js
index 105474462bc9..d06a3e871a00 100644
--- a/packages/cli/src/commands/serve.js
+++ b/packages/cli/src/commands/serve.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/cache/cacheHandler.js b/packages/cli/src/commands/setup/cache/cacheHandler.js
index a742f982cf20..7ba40160adb5 100644
--- a/packages/cli/src/commands/setup/cache/cacheHandler.js
+++ b/packages/cli/src/commands/setup/cache/cacheHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addEnvVarTask } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js b/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js
index 4f14f0db3d63..5d360dc2d7b7 100644
--- a/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js
+++ b/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'
diff --git a/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js b/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js
index c89b89071c25..98c45ed54fe1 100644
--- a/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js
+++ b/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js
@@ -1,9 +1,10 @@
 // Automock fs using ../..../__mocks__/fs
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { getPaths } from '../../../../lib'
 import { updateApiURLTask } from '../helpers'
 // Mock telemetry and other things
diff --git a/packages/cli/src/commands/setup/deploy/helpers/index.js b/packages/cli/src/commands/setup/deploy/helpers/index.js
index 0a04b91e2c48..957ef661aef4 100644
--- a/packages/cli/src/commands/setup/deploy/helpers/index.js
+++ b/packages/cli/src/commands/setup/deploy/helpers/index.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { getPaths, writeFilesTask } from '../../../../lib'
diff --git a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js
index 4c1b36e9fc83..cd16d452230b 100644
--- a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js
+++ b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import toml from '@iarna/toml'
 import { getSchema, getConfig } from '@prisma/internals'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import {
diff --git a/packages/cli/src/commands/setup/deploy/providers/edgio.js b/packages/cli/src/commands/setup/deploy/providers/edgio.js
index abe121e651ab..c7e4038db751 100644
--- a/packages/cli/src/commands/setup/deploy/providers/edgio.js
+++ b/packages/cli/src/commands/setup/deploy/providers/edgio.js
@@ -1,5 +1,4 @@
-import fs from 'fs'
-
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
index 42633d6bdfb3..17bd304dc766 100644
--- a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
+++ b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js
@@ -1,9 +1,9 @@
 // import terminalLink from 'terminal-link'
-import fs from 'fs'
 import { EOL } from 'os'
 import path from 'path'
 
 import { getSchema, getConfig } from '@prisma/internals'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/deploy/providers/render.js b/packages/cli/src/commands/setup/deploy/providers/render.js
index 2c36a7fffb43..e54fac390183 100644
--- a/packages/cli/src/commands/setup/deploy/providers/render.js
+++ b/packages/cli/src/commands/setup/deploy/providers/render.js
@@ -1,8 +1,8 @@
 // import terminalLink from 'terminal-link'
-import fs from 'fs'
 import path from 'path'
 
 import { getSchema, getConfig } from '@prisma/internals'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/deploy/providers/serverless.js b/packages/cli/src/commands/setup/deploy/providers/serverless.js
index a1ac10fe916e..825a4d75ea54 100644
--- a/packages/cli/src/commands/setup/deploy/providers/serverless.js
+++ b/packages/cli/src/commands/setup/deploy/providers/serverless.js
@@ -1,7 +1,7 @@
 // import terminalLink from 'terminal-link'
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/deploy/templates/serverless/api.js b/packages/cli/src/commands/setup/deploy/templates/serverless/api.js
index 9ca33d04f17c..2772c29beee1 100644
--- a/packages/cli/src/commands/setup/deploy/templates/serverless/api.js
+++ b/packages/cli/src/commands/setup/deploy/templates/serverless/api.js
@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { getPaths } from '../../../../../lib'
 
 export const PROJECT_NAME = path.basename(getPaths().base)
diff --git a/packages/cli/src/commands/setup/generator/generator.js b/packages/cli/src/commands/setup/generator/generator.js
index 9c61795c0532..0d97b5ea0503 100644
--- a/packages/cli/src/commands/setup/generator/generator.js
+++ b/packages/cli/src/commands/setup/generator/generator.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import terminalLink from 'terminal-link'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js b/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js
index c2f0c148f71c..ad7be334c31c 100644
--- a/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js
+++ b/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { registerApiSideBabelHook } from '@redwoodjs/babel-config'
diff --git a/packages/cli/src/commands/setup/i18n/i18nHandler.js b/packages/cli/src/commands/setup/i18n/i18nHandler.js
index 1e07e255ba81..362f49749b71 100644
--- a/packages/cli/src/commands/setup/i18n/i18nHandler.js
+++ b/packages/cli/src/commands/setup/i18n/i18nHandler.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'
diff --git a/packages/cli/src/commands/setup/mailer/mailerHandler.js b/packages/cli/src/commands/setup/mailer/mailerHandler.js
index a25ce2966c18..7d8fcb556dc9 100644
--- a/packages/cli/src/commands/setup/mailer/mailerHandler.js
+++ b/packages/cli/src/commands/setup/mailer/mailerHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js b/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js
index 0149b0cea909..d29ff1d969f4 100644
--- a/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js
+++ b/packages/cli/src/commands/setup/package/__tests__/packageHandler.test.js
@@ -34,10 +34,10 @@ jest.mock('enquirer', () => {
   }
 })
 
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 
 import { getCompatibilityData } from '@redwoodjs/cli-helpers'
 
diff --git a/packages/cli/src/commands/setup/realtime/realtimeHandler.js b/packages/cli/src/commands/setup/realtime/realtimeHandler.js
index 7764cc340efc..1c2d1f58107e 100644
--- a/packages/cli/src/commands/setup/realtime/realtimeHandler.js
+++ b/packages/cli/src/commands/setup/realtime/realtimeHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addApiPackages } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js
index 40ed1a6273d7..d37626878af4 100644
--- a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js
+++ b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import { outputFileSync } from 'fs-extra'
 import { Listr } from 'listr2'
 import terminalLink from 'terminal-link'
diff --git a/packages/cli/src/commands/setup/vite/viteHandler.js b/packages/cli/src/commands/setup/vite/viteHandler.js
index 993c29a94a8b..81c1f27637fa 100644
--- a/packages/cli/src/commands/setup/vite/viteHandler.js
+++ b/packages/cli/src/commands/setup/vite/viteHandler.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { addWebPackages } from '@redwoodjs/cli-helpers'
diff --git a/packages/cli/src/commands/setup/webpack/webpackHandler.js b/packages/cli/src/commands/setup/webpack/webpackHandler.js
index 6c10cdb83a93..50d146c7ad6f 100644
--- a/packages/cli/src/commands/setup/webpack/webpackHandler.js
+++ b/packages/cli/src/commands/setup/webpack/webpackHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 import { errorTelemetry } from '@redwoodjs/telemetry'
diff --git a/packages/cli/src/commands/testHandler.js b/packages/cli/src/commands/testHandler.js
index 9234684d570d..64088af120be 100644
--- a/packages/cli/src/commands/testHandler.js
+++ b/packages/cli/src/commands/testHandler.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 
 import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { ensurePosixPath } from '@redwoodjs/project-config'
diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js
index c200997a183b..27af9aac365a 100644
--- a/packages/cli/src/commands/upgrade.js
+++ b/packages/cli/src/commands/upgrade.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import execa from 'execa'
+import fs from 'fs-extra'
 import latestVersion from 'latest-version'
 import { Listr } from 'listr2'
 import terminalLink from 'terminal-link'
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index 8860101805f6..c0130ea2feac 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-import fs from 'fs'
 import path from 'path'
 
 import { trace, SpanStatusCode } from '@opentelemetry/api'
 import { config } from 'dotenv-defaults'
+import fs from 'fs-extra'
 import { hideBin, Parser } from 'yargs/helpers'
 import yargs from 'yargs/yargs'
 
diff --git a/packages/cli/src/lib/__tests__/index.test.js b/packages/cli/src/lib/__tests__/index.test.js
index 3883c1dfe98d..ee2218118a6f 100644
--- a/packages/cli/src/lib/__tests__/index.test.js
+++ b/packages/cli/src/lib/__tests__/index.test.js
@@ -15,9 +15,10 @@ jest.mock('@redwoodjs/project-config', () => {
   }
 })
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import * as index from '../index'
 
 test('nameVariants returns a single word cased variables', () => {
diff --git a/packages/cli/src/lib/__tests__/locking.test.js b/packages/cli/src/lib/__tests__/locking.test.js
index d73d2ca303c6..8728adc51e71 100644
--- a/packages/cli/src/lib/__tests__/locking.test.js
+++ b/packages/cli/src/lib/__tests__/locking.test.js
@@ -13,9 +13,10 @@ jest.mock('@redwoodjs/project-config', () => {
 })
 jest.mock('fs')
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { setLock, unsetLock, isLockSet, clearLocks } from '../locking'
 
 beforeEach(() => {
diff --git a/packages/cli/src/lib/__tests__/rollback.test.js b/packages/cli/src/lib/__tests__/rollback.test.js
index 830103d4d85e..3e25ecc1529e 100644
--- a/packages/cli/src/lib/__tests__/rollback.test.js
+++ b/packages/cli/src/lib/__tests__/rollback.test.js
@@ -1,6 +1,6 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 
 jest.mock('fs')
diff --git a/packages/cli/src/lib/__tests__/updateCheck.test.js b/packages/cli/src/lib/__tests__/updateCheck.test.js
index c97742f1735f..e7a1bcd5fe82 100644
--- a/packages/cli/src/lib/__tests__/updateCheck.test.js
+++ b/packages/cli/src/lib/__tests__/updateCheck.test.js
@@ -17,8 +17,7 @@ jest.mock('@redwoodjs/project-config', () => {
   }
 })
 
-import fs from 'fs'
-
+import fs from 'fs-extra'
 import latestVersion from 'latest-version'
 
 import { getConfig } from '@redwoodjs/project-config'
diff --git a/packages/cli/src/lib/extendFile.js b/packages/cli/src/lib/extendFile.js
index 2ce353f7ae74..fd1fec98a0c5 100644
--- a/packages/cli/src/lib/extendFile.js
+++ b/packages/cli/src/lib/extendFile.js
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'fs-extra'
 
 /**
  * Convenience function to check if a file includes a particular string.
diff --git a/packages/cli/src/lib/generatePrismaClient.js b/packages/cli/src/lib/generatePrismaClient.js
index 43ce4c74d01b..39fb53486d20 100644
--- a/packages/cli/src/lib/generatePrismaClient.js
+++ b/packages/cli/src/lib/generatePrismaClient.js
@@ -1,8 +1,9 @@
 // helper used in Dev and Build commands
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { runCommandTask, getPaths } from '../lib'
 
 const skipTask = (schema = getPaths().api.dbSchema) => {
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index aab2ad24733f..3aae217d4576 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -1,5 +1,4 @@
 import { execSync } from 'child_process'
-import fs from 'fs'
 import https from 'https'
 import path from 'path'
 
@@ -8,6 +7,7 @@ import boxen from 'boxen'
 import camelcase from 'camelcase'
 import decamelize from 'decamelize'
 import execa from 'execa'
+import fs from 'fs-extra'
 import { Listr } from 'listr2'
 import { memoize, template } from 'lodash'
 import { paramCase } from 'param-case'
diff --git a/packages/cli/src/lib/locking.js b/packages/cli/src/lib/locking.js
index bbafb6f0eb4e..23095b9b8005 100644
--- a/packages/cli/src/lib/locking.js
+++ b/packages/cli/src/lib/locking.js
@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { getPaths } from './index'
 
 /**
diff --git a/packages/cli/src/lib/plugin.js b/packages/cli/src/lib/plugin.js
index d5fc70d3fb98..ba9473fb2527 100644
--- a/packages/cli/src/lib/plugin.js
+++ b/packages/cli/src/lib/plugin.js
@@ -1,7 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
 import chalk from 'chalk'
+import fs from 'fs-extra'
 
 import { getCompatibilityData } from '@redwoodjs/cli-helpers'
 
diff --git a/packages/cli/src/lib/project.js b/packages/cli/src/lib/project.js
index deb1d019a7c6..e5b964c2b467 100644
--- a/packages/cli/src/lib/project.js
+++ b/packages/cli/src/lib/project.js
@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import { getPaths } from '.'
 
 export const isTypeScriptProject = () => {
diff --git a/packages/cli/src/lib/rollback.js b/packages/cli/src/lib/rollback.js
index 62107d60311e..7bc11f951ca0 100644
--- a/packages/cli/src/lib/rollback.js
+++ b/packages/cli/src/lib/rollback.js
@@ -1,6 +1,7 @@
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 // The stack containing rollback actions
 let rollback = []
 
diff --git a/packages/cli/src/lib/schemaHelpers.js b/packages/cli/src/lib/schemaHelpers.js
index cf75aa95e031..0e0558b3a5a5 100644
--- a/packages/cli/src/lib/schemaHelpers.js
+++ b/packages/cli/src/lib/schemaHelpers.js
@@ -1,6 +1,5 @@
-import fs from 'fs'
-
 import { getConfig, getDMMF } from '@prisma/internals'
+import fs from 'fs-extra'
 
 import { ensureUniquePlural } from './pluralHelpers'
 import { singularize, isPlural } from './rwPluralize'
diff --git a/packages/cli/src/lib/test.js b/packages/cli/src/lib/test.js
index da733d2f90fa..cf89be25d000 100644
--- a/packages/cli/src/lib/test.js
+++ b/packages/cli/src/lib/test.js
@@ -8,9 +8,10 @@
 //   expect('some output').toEqual(loadComponentFixture('component', 'filename.js'))
 // })
 
-import fs from 'fs'
 import path from 'path'
 
+import fs from 'fs-extra'
+
 import './mockTelemetry'
 
 jest.mock('@redwoodjs/internal/dist/generate/generate', () => {
diff --git a/packages/cli/src/lib/updateCheck.js b/packages/cli/src/lib/updateCheck.js
index 24fd70feca9c..59c3dfc9aa12 100644
--- a/packages/cli/src/lib/updateCheck.js
+++ b/packages/cli/src/lib/updateCheck.js
@@ -1,8 +1,8 @@
-import fs from 'fs'
 import path from 'path'
 
 import boxen from 'boxen'
 import chalk from 'chalk'
+import fs from 'fs-extra'
 import latestVersion from 'latest-version'
 import semver from 'semver'
 
diff --git a/packages/cli/src/rwfw.js b/packages/cli/src/rwfw.js
index 77ecc130698d..c0fbb490483b 100644
--- a/packages/cli/src/rwfw.js
+++ b/packages/cli/src/rwfw.js
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-import fs from 'fs'
 import path from 'path'
 
 import Configstore from 'configstore/index'
 import execa from 'execa'
+import fs from 'fs-extra'
 import TerminalLink from 'terminal-link'
 
 import { getConfigPath } from '@redwoodjs/project-config'