diff --git a/packages/cra-template/template/gitignore b/packages/cra-template/template/gitignore
index 87717e549dd..4d29575de80 100644
--- a/packages/cra-template/template/gitignore
+++ b/packages/cra-template/template/gitignore
@@ -9,11 +9,7 @@
 /coverage
 
 # production
-# /build
-# Changed from /build to /dist because this is default for
-# Netlify when deploying an app using `@upleveled/react-scripts`
-# Ref: https://github.com/upleveled/create-react-app/commit/ab165a178994751e837d2835b2a4dbcc48f6f709#
-/dist
+/build
 
 # misc
 .DS_Store
diff --git a/packages/cra-template/template/netlify.toml b/packages/cra-template/template/netlify.toml
new file mode 100644
index 00000000000..f92001e0c78
--- /dev/null
+++ b/packages/cra-template/template/netlify.toml
@@ -0,0 +1,3 @@
+[build]
+  publish = "build"
+  command = "pnpm run build"
diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js
index 45394a880f4..ed321ae57f2 100644
--- a/packages/react-scripts/config/paths.js
+++ b/packages/react-scripts/config/paths.js
@@ -29,10 +29,7 @@ const publicUrlOrPath = getPublicUrlOrPath(
   process.env.PUBLIC_URL,
 );
 
-const buildPath =
-  process.env.BUILD_PATH ||
-  // Default for Netlify when deploying an app using `@upleveled/react-scripts`
-  'dist';
+const buildPath = process.env.BUILD_PATH || 'build';
 
 const moduleFileExtensions = [
   'web.mjs',