diff --git a/.changeset/cold-jeans-stare.md b/.changeset/cold-jeans-stare.md
new file mode 100644
index 0000000000..c0356db3ad
--- /dev/null
+++ b/.changeset/cold-jeans-stare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated the template to use `@backstage/cli/config/prettier` instead of `@spotify/prettier-config`.
diff --git a/.changeset/popular-donkeys-rhyme.md b/.changeset/popular-donkeys-rhyme.md
new file mode 100644
index 0000000000..90195ff999
--- /dev/null
+++ b/.changeset/popular-donkeys-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added `@backstage/cli/config/prettier` as a replacement for `@spotify/prettier-config`, but with the same configuration.
diff --git a/microsite/package.json b/microsite/package.json
index fc3405c744..e3b0388903 100644
--- a/microsite/package.json
+++ b/microsite/package.json
@@ -17,7 +17,7 @@
     "version": "docusaurus-version",
     "write-translations": "docusaurus-write-translations"
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "dependencies": {
     "@docusaurus/core": "^3.1.1",
     "@docusaurus/plugin-client-redirects": "^3.1.1",
@@ -38,7 +38,6 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^3.1.1",
     "@docusaurus/tsconfig": "^3.1.1",
-    "@spotify/prettier-config": "^15.0.0",
     "@types/luxon": "^3.0.0",
     "@types/webpack-env": "^1.18.0",
     "js-yaml": "^4.1.0",
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 0c9fcaabad..8624df23fd 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -2684,15 +2684,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@spotify/prettier-config@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@spotify/prettier-config@npm:15.0.0"
-  peerDependencies:
-    prettier: 2.x
-  checksum: aa5ec5739427f9acdb9d62ae6c04f04a344898567239f7ee45c75c6205ebdffbc61747ea8de6e83baf0bc3785359967de4b7097a8723c4b4063ff57dc5cb6c44
-  languageName: node
-  linkType: hard
-
 "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0":
   version: 8.0.0
   resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0"
@@ -4008,7 +3999,6 @@ __metadata:
     "@docusaurus/tsconfig": ^3.1.1
     "@docusaurus/types": ^3.1.1
     "@mdx-js/react": ^3.0.0
-    "@spotify/prettier-config": ^15.0.0
     "@swc/core": ^1.3.46
     "@types/luxon": ^3.0.0
     "@types/webpack-env": ^1.18.0
diff --git a/package.json b/package.json
index f86d05acf6..8673bfaad9 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
       "node ./scripts/verify-lockfile-duplicates --fix"
     ]
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "resolutions": {
     "@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch",
     "@material-ui/pickers@^3.2.10": "patch:@material-ui/pickers@npm%3A3.3.11#./.yarn/patches/@material-ui-pickers-npm-3.3.11-1c8f68ea20.patch",
@@ -108,7 +108,6 @@
     "@octokit/rest": "^19.0.3",
     "@playwright/test": "^1.32.3",
     "@spotify/eslint-plugin": "^15.0.0",
-    "@spotify/prettier-config": "^15.0.0",
     "@techdocs/cli": "workspace:*",
     "@types/node": "^20.16.0",
     "@types/webpack": "^5.28.0",
diff --git a/packages/cli/config/prettier.json b/packages/cli/config/prettier.json
new file mode 100644
index 0000000000..5393aaf2da
--- /dev/null
+++ b/packages/cli/config/prettier.json
@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "arrowParens": "avoid"
+}
diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs
index 73f97484f9..21bdd41bdf 100644
--- a/packages/create-app/templates/default-app/package.json.hbs
+++ b/packages/create-app/templates/default-app/package.json.hbs
@@ -34,7 +34,6 @@
     "@backstage/cli": "^{{version '@backstage/cli'}}",
     "@backstage/e2e-test-utils": "^{{version '@backstage/e2e-test-utils'}}",
     "@playwright/test": "^1.32.3",
-    "@spotify/prettier-config": "^12.0.0",
     "node-gyp": "^10.0.0",
     "prettier": "^2.3.2",
     "typescript": "~5.4.0"
@@ -43,7 +42,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18"
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "lint-staged": {
     "*.{js,jsx,ts,tsx,mjs,cjs}": [
       "eslint --fix",
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index 2fbfe587e6..d7ff1757a0 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -30,7 +30,7 @@
       "last 1 safari version"
     ]
   },
-  "prettier": "@spotify/prettier-config",
+  "prettier": "@backstage/cli/config/prettier",
   "dependencies": {
     "@backstage/app-defaults": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
diff --git a/yarn.lock b/yarn.lock
index 133a7ba5df..393d278a8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16073,15 +16073,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@spotify/prettier-config@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "@spotify/prettier-config@npm:15.0.0"
-  peerDependencies:
-    prettier: 2.x
-  checksum: aa5ec5739427f9acdb9d62ae6c04f04a344898567239f7ee45c75c6205ebdffbc61747ea8de6e83baf0bc3785359967de4b7097a8723c4b4063ff57dc5cb6c44
-  languageName: node
-  linkType: hard
-
 "@stoplight/better-ajv-errors@npm:1.0.3":
   version: 1.0.3
   resolution: "@stoplight/better-ajv-errors@npm:1.0.3"
@@ -40265,7 +40256,6 @@ __metadata:
     "@octokit/rest": ^19.0.3
     "@playwright/test": ^1.32.3
     "@spotify/eslint-plugin": ^15.0.0
-    "@spotify/prettier-config": ^15.0.0
     "@techdocs/cli": "workspace:*"
     "@types/global-agent": ^2.1.3
     "@types/node": ^20.16.0