diff --git a/.changeset/config.json b/.changeset/config.json
index 9c12e3e30..8114d8685 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -7,5 +7,5 @@
 	"access": "public",
 	"baseBranch": "main",
 	"updateInternalDependencies": "patch",
-	"ignore": [ "@sveltejs/*", "community-addon-template" ]
+	"ignore": [ "@sveltejs/*" ]
 }
diff --git a/.gitignore b/.gitignore
index c55b88816..bb6c2737e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ temp/
 package-lock.json
 yarn.lock
 vite.config.js.timestamp-*
-.test-output
+.test-output
\ No newline at end of file
diff --git a/community-addon-template/.gitignore b/community-addon-template/.gitignore
deleted file mode 100644
index a9e1699a5..000000000
--- a/community-addon-template/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules
-temp
-.outputs
-.test-output
diff --git a/community-addon-template/src/index.js b/community-addon-template/src/index.js
deleted file mode 100644
index 61dc312ea..000000000
--- a/community-addon-template/src/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { defineAddon, defineAddonOptions } from '@sveltejs/cli-core';
-import { imports } from '@sveltejs/cli-core/js';
-import { parseSvelte } from '@sveltejs/cli-core/parsers';
-
-export const options = defineAddonOptions()
-	.add('demo', {
-		question: 'Do you want to use a demo?',
-		type: 'boolean',
-		default: false
-	})
-	.build();
-
-export default defineAddon({
-	id: 'community-addon',
-	options,
-	setup: ({ kit, unsupported }) => {
-		if (!kit) unsupported('Requires SvelteKit');
-	},
-	run: ({ sv, options, typescript }) => {
-		sv.file('addon-template-demo.txt', (content) => {
-			if (options.demo) {
-				return 'This is a text file made by the Community Addon Template demo!';
-			}
-			return content;
-		});
-
-		sv.file('src/DemoComponent.svelte', (content) => {
-			if (!options.demo) return content;
-			const { script, generateCode } = parseSvelte(content, { typescript });
-			imports.addDefault(script.ast, { from: '../addon-template-demo.txt?raw', as: 'demo' });
-			return generateCode({ script: script.generateCode(), template: '{demo}' });
-		});
-	}
-});
diff --git a/documentation/docs/20-commands/10-sv-create.md b/documentation/docs/20-commands/10-sv-create.md
index fc4a4b932..12c9ece18 100644
--- a/documentation/docs/20-commands/10-sv-create.md
+++ b/documentation/docs/20-commands/10-sv-create.md
@@ -19,6 +19,7 @@ Which project template to use:
 - `minimal` — barebones scaffolding for your new app
 - `demo` — showcase app with a word guessing game that works without JavaScript
 - `library` — template for a Svelte library, set up with `svelte-package`
+- `addon` — template for a community add-on, ready to be tested & published
 
 ### `--types <option>`
 
diff --git a/eslint.config.js b/eslint.config.js
index 8beb18951..ad5736762 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -32,7 +32,6 @@ export default [
 			'**/dist/*',
 			'packages/**/tests/**/{output,input}.ts',
 			'rolldown.config.js',
-			'community-addon-template/tests/*'
 		]
 	}
 ];
diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts
index 379b1807b..4d8e1dc6b 100644
--- a/packages/cli/commands/add/index.ts
+++ b/packages/cli/commands/add/index.ts
@@ -75,7 +75,8 @@ export const add = new Command('add')
 	.option('--no-git-check', 'even if some files are dirty, no prompt will be shown')
 	.option('--no-install', 'skip installing dependencies')
 	.addOption(installOption)
-	//.option('--community [add-on...]', 'community addons to install')
+	// TODO JYC: remove the flag
+	.option('--community [add-on...]', 'community addons to install')
 	.configureHelp({
 		...common.helpConfig,
 		formatHelp(cmd, helper) {
@@ -541,7 +542,7 @@ export async function runAddCommand(
 		workspace,
 		addonSetupResults,
 		addons: addonMap,
-		options: official
+		options: { ...official, ...community }
 	});
 
 	p.log.success('Successfully setup add-ons');
diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
index e1ea5a169..eb9c0ecf4 100644
--- a/packages/cli/commands/create.ts
+++ b/packages/cli/commands/create.ts
@@ -141,8 +141,9 @@ async function createProject(cwd: ProjectPath, options: Options) {
 					options: templates.map((t) => ({ label: t.title, value: t.name, hint: t.description }))
 				});
 			},
-			language: () => {
+			language: (o) => {
 				if (options.types) return Promise.resolve(options.types);
+				if (o.results.template === 'addon') return Promise.resolve('none'); // TODO JYC
 				return p.select<LanguageType>({
 					message: 'Add type checking with TypeScript?',
 					initialValue: 'typescript',
@@ -166,7 +167,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	createKit(projectPath, {
 		name: path.basename(projectPath),
 		template,
-		types: language
+		types: language as LanguageType // TODO JYC not sure why?!
 	});
 
 	p.log.success('Project created');
@@ -180,7 +181,8 @@ async function createProject(cwd: ProjectPath, options: Options) {
 		if (packageManager) await installDependencies(packageManager, projectPath);
 	};
 
-	if (options.addOns) {
+	// TODO JYC: no add-ons for addon template
+	if (options.addOns && options.template !== 'addon') {
 		// `runAddCommand` includes installing dependencies
 		const { nextSteps, packageManager: pm } = await runAddCommand(
 			{
diff --git a/packages/create/index.ts b/packages/create/index.ts
index 7e92162fe..e03b84229 100644
--- a/packages/create/index.ts
+++ b/packages/create/index.ts
@@ -5,7 +5,7 @@ import { mkdirp, copy, dist } from './utils.ts';
 export type TemplateType = (typeof templateTypes)[number];
 export type LanguageType = (typeof languageTypes)[number];
 
-const templateTypes = ['minimal', 'demo', 'library'] as const;
+const templateTypes = ['minimal', 'demo', 'library', 'addon'] as const;
 const languageTypes = ['typescript', 'checkjs', 'none'] as const;
 
 export type Options = {
@@ -61,7 +61,7 @@ function write_template_files(template: string, types: LanguageType, name: strin
 		const dest = path.join(cwd, file.name);
 		mkdirp(path.dirname(dest));
 
-		fs.writeFileSync(dest, file.contents.replace(/~TODO~/g, name));
+		fs.writeFileSync(dest, file.contents.replace(/~SV-NAME-TODO~/g, name));
 	});
 }
 
@@ -84,7 +84,7 @@ function write_common_files(cwd: string, options: Options, name: string) {
 		} else {
 			const dest = path.join(cwd, file.name);
 			mkdirp(path.dirname(dest));
-			fs.writeFileSync(dest, file.contents);
+			fs.writeFileSync(dest, file.contents.replace(/~SV-NAME-TODO~/g, name));
 		}
 	});
 
diff --git a/packages/create/scripts/build-templates.js b/packages/create/scripts/build-templates.js
index dccdc8ec7..159a595ef 100644
--- a/packages/create/scripts/build-templates.js
+++ b/packages/create/scripts/build-templates.js
@@ -95,6 +95,15 @@ async function generate_templates(dist, shared) {
 				let contents = fs.readFileSync(path.join(cwd, name), 'utf8');
 				// TODO package-specific versions
 				contents = contents.replace(/workspace:\*/g, 'next');
+
+				// TODO JYC (maybe could be a dev mode and prod mode ?)
+				const pkg = JSON.parse(contents);
+				if (pkg.dependencies && pkg.dependencies['@sveltejs/cli-core'])
+					pkg.dependencies['@sveltejs/cli-core'] = 'file:../../packages/core';
+				if (pkg.devDependencies && pkg.devDependencies['sv'])
+					pkg.devDependencies['sv'] = 'file:../../packages/cli';
+				contents = JSON.stringify(pkg, null, '\t');
+
 				fs.writeFileSync(path.join(dir, 'package.json'), contents);
 				continue;
 			}
diff --git a/community-addon-template/README.md b/packages/create/shared/+addon/README.md
similarity index 60%
rename from community-addon-template/README.md
rename to packages/create/shared/+addon/README.md
index 0d48cd78f..cbf00f385 100644
--- a/community-addon-template/README.md
+++ b/packages/create/shared/+addon/README.md
@@ -1,21 +1,14 @@
-# community-addon-template
+# sv community addon: ~SV-NAME-TODO~
 
 > [!IMPORTANT]
 > Community add-ons are currently not supported. Please see [#184](https://github.com/sveltejs/cli/issues/184) for details.
 
 > [!IMPORTANT]
 > This template's dependencies may not be up-to-date; be sure to update them to the latest!
-> If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/add-ons).
 
-The add-on template for community add-ons for [`sv`](https://github.com/sveltejs/cli).
+> If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/addons).
 
-## Cloning the template
-
-Use [`degit`](https://github.com/Rich-Harris/degit) to clone the template:
-
-```shell
-npx degit sveltejs/cli/community-addon-template addon-name
-```
+created with [`sv`](https://svelte.dev/docs/cli/sv-create#Options-template-name).
 
 ## Using the add-on
 
@@ -24,15 +17,15 @@ To run the add-on, we'll first need a project to apply it to.
 Create the project with the following script:
 
 ```shell
-npm run create-temp
+npm run create
 ```
 
-This will create a SvelteKit project in the `temp` directory.
+This will create a SvelteKit project in the `demo` directory.
 
 To execute the add-on, run:
 
 ```shell
-npm start
+npm run add
 ```
 
 ## Sharing your add-on
@@ -48,11 +41,9 @@ Your published add-on can now be used by anyone!
 To execute the newly published package with `sv`, run:
 
 ```shell
-npx sv add --community npm:addon-package-name
+npx sv add npm:~SV-NAME-TODO~
 ```
 
-After that, feel free to open a pull request to [`sv`](https://github.com/sveltejs/cli) and add your add-on to the [community list](/community-addons/).
-
 ## Things to be aware of
 
 Community add-ons are **not permitted** to have any external dependencies outside of `@sveltejs/cli-core`. If the use of a dependency is absolutely necessary, then they can be bundled using a bundler of your choosing (e.g. Rollup, Rolldown, tsup, etc.).
diff --git a/packages/create/templates/addon/.gitignore b/packages/create/templates/addon/.gitignore
new file mode 100644
index 000000000..ace55725e
--- /dev/null
+++ b/packages/create/templates/addon/.gitignore
@@ -0,0 +1,26 @@
+node_modules
+demo/
+
+# Output
+.output
+.vercel
+.netlify
+.wrangler
+/.svelte-kit
+/build
+/dist
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Env
+.env
+.env.*
+!.env.example
+!.env.test
+
+# Vite
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
+
diff --git a/packages/create/templates/addon/.ignore b/packages/create/templates/addon/.ignore
new file mode 100644
index 000000000..449d6440c
--- /dev/null
+++ b/packages/create/templates/addon/.ignore
@@ -0,0 +1,3 @@
+package.json
+.meta.json
+.turbo
\ No newline at end of file
diff --git a/packages/create/templates/addon/.meta.json b/packages/create/templates/addon/.meta.json
new file mode 100644
index 000000000..ca10b19a7
--- /dev/null
+++ b/packages/create/templates/addon/.meta.json
@@ -0,0 +1,4 @@
+{
+	"title": "sv community add-on",
+	"description": "scaffolding an empty community add-on, ready to be tested and published"
+}
diff --git a/community-addon-template/jsconfig.json b/packages/create/templates/addon/jsconfig.json
similarity index 100%
rename from community-addon-template/jsconfig.json
rename to packages/create/templates/addon/jsconfig.json
diff --git a/community-addon-template/package.json b/packages/create/templates/addon/package.template.json
similarity index 51%
rename from community-addon-template/package.json
rename to packages/create/templates/addon/package.template.json
index e69890a67..71b07b4ee 100644
--- a/community-addon-template/package.json
+++ b/packages/create/templates/addon/package.template.json
@@ -1,18 +1,14 @@
 {
-	"name": "community-addon-template",
-	"private": true,
+	"name": "~SV-NAME-TODO~",
 	"version": "0.0.0",
 	"type": "module",
 	"license": "MIT",
 	"scripts": {
-		"create-temp": "sv create temp --types ts --template minimal --no-add-ons --no-install",
-		"start": "sv add -C temp --community file:../",
+		"create": "sv create demo --types ts --template minimal --no-add-ons",
+		"add": "sv add -C demo --community file:../ --no-git-check",
 		"test": "vitest run"
 	},
-	"files": [
-		"src",
-		"!src/**/*.test.*"
-	],
+	"files": ["src", "!src/**/*.test.*"],
 	"exports": "./src/index.js",
 	"dependencies": {
 		"@sveltejs/cli-core": "workspace:*"
@@ -22,8 +18,5 @@
 		"sv": "workspace:*",
 		"vitest": "4.0.0-beta.6"
 	},
-	"keywords": [
-		"svelte-add-on",
-		"sv"
-	]
+	"keywords": ["svelte-add-on", "sv", "sv-add-on"]
 }
diff --git a/packages/create/templates/addon/src/index.js b/packages/create/templates/addon/src/index.js
new file mode 100644
index 000000000..f3cb5b804
--- /dev/null
+++ b/packages/create/templates/addon/src/index.js
@@ -0,0 +1,45 @@
+import { defineAddon, defineAddonOptions } from '@sveltejs/cli-core';
+import { imports } from '@sveltejs/cli-core/js';
+import { parseSvelte } from '@sveltejs/cli-core/parsers';
+
+export const options = defineAddonOptions()
+	.add('demo', {
+		question: 'Do you want to use a demo?',
+		type: 'boolean',
+		default: false
+	})
+	.build();
+
+export default defineAddon({
+	id: 'community-addon',
+	options,
+	setup: ({ kit, unsupported }) => {
+		if (!kit) unsupported('Requires SvelteKit');
+	},
+	run: ({ sv, options, typescript }) => {
+		sv.file('src/lib/add-on/addon-template-demo.txt', (content) => {
+			if (!options.demo) return content;
+			return 'This is a text file made by the Community Addon Template demo! with your add-on: ~SV-NAME-TODO~!';
+		});
+
+		sv.file('src/lib/add-on/DemoComponent.svelte', (content) => {
+			if (!options.demo) return content;
+			const { script, generateCode } = parseSvelte(content, { typescript });
+			imports.addDefault(script.ast, { from: './addon-template-demo.txt?raw', as: 'demo' });
+			return generateCode({ script: script.generateCode(), template: '{demo}' });
+		});
+
+		sv.file('src/routes/+page.svelte', (content) => {
+			if (!options.demo) return content;
+			const { script, generateCode, template } = parseSvelte(content, { typescript });
+			imports.addDefault(script.ast, {
+				from: '$lib/add-on/DemoComponent.svelte',
+				as: 'DemoComponent'
+			});
+			return generateCode({
+				script: script.generateCode(),
+				template: template.generateCode() + '\n\n<DemoComponent />'
+			});
+		});
+	}
+});
diff --git a/community-addon-template/tests/custom-addon.test.ts b/packages/create/templates/addon/tests/custom-addon.test.ts
similarity index 100%
rename from community-addon-template/tests/custom-addon.test.ts
rename to packages/create/templates/addon/tests/custom-addon.test.ts
diff --git a/community-addon-template/tests/fixtures/+page.svelte b/packages/create/templates/addon/tests/fixtures/+page.svelte
similarity index 100%
rename from community-addon-template/tests/fixtures/+page.svelte
rename to packages/create/templates/addon/tests/fixtures/+page.svelte
diff --git a/community-addon-template/tests/fixtures/App.svelte b/packages/create/templates/addon/tests/fixtures/App.svelte
similarity index 100%
rename from community-addon-template/tests/fixtures/App.svelte
rename to packages/create/templates/addon/tests/fixtures/App.svelte
diff --git a/community-addon-template/tests/setup/global.ts b/packages/create/templates/addon/tests/setup/global.ts
similarity index 100%
rename from community-addon-template/tests/setup/global.ts
rename to packages/create/templates/addon/tests/setup/global.ts
diff --git a/community-addon-template/tests/setup/suite.ts b/packages/create/templates/addon/tests/setup/suite.ts
similarity index 100%
rename from community-addon-template/tests/setup/suite.ts
rename to packages/create/templates/addon/tests/setup/suite.ts
diff --git a/community-addon-template/vitest.config.js b/packages/create/templates/addon/vitest.config.js
similarity index 100%
rename from community-addon-template/vitest.config.js
rename to packages/create/templates/addon/vitest.config.js
diff --git a/packages/create/templates/demo/package.template.json b/packages/create/templates/demo/package.template.json
index f15a53337..7aeb941c1 100644
--- a/packages/create/templates/demo/package.template.json
+++ b/packages/create/templates/demo/package.template.json
@@ -1,5 +1,5 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"private": true,
 	"version": "0.0.1",
 	"type": "module",
diff --git a/packages/create/templates/library/package.template.json b/packages/create/templates/library/package.template.json
index 8784dadc9..e23149db5 100644
--- a/packages/create/templates/library/package.template.json
+++ b/packages/create/templates/library/package.template.json
@@ -1,5 +1,5 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"version": "0.0.1",
 	"scripts": {
 		"dev": "vite dev",
diff --git a/packages/create/templates/minimal/package.template.json b/packages/create/templates/minimal/package.template.json
index 19ade13a0..74edefb51 100644
--- a/packages/create/templates/minimal/package.template.json
+++ b/packages/create/templates/minimal/package.template.json
@@ -1,5 +1,5 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"private": true,
 	"version": "0.0.1",
 	"type": "module",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 49db25502..1296035a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,22 +69,6 @@ importers:
         specifier: 4.0.0-beta.6
         version: 4.0.0-beta.6(@types/node@22.15.32)(@vitest/ui@4.0.0-beta.6)
 
-  community-addon-template:
-    dependencies:
-      '@sveltejs/cli-core':
-        specifier: workspace:*
-        version: link:../packages/core
-    devDependencies:
-      '@playwright/test':
-        specifier: ^1.53.1
-        version: 1.53.1
-      sv:
-        specifier: workspace:*
-        version: link:../packages/cli
-      vitest:
-        specifier: 4.0.0-beta.6
-        version: 4.0.0-beta.6(@types/node@22.15.32)(@vitest/ui@4.0.0-beta.6)
-
   packages/addons:
     dependencies:
       '@sveltejs/cli-core':
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 86c4b35e7..90820b37d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,3 @@
 packages:
   - 'packages/*'
-  - 'community-addon-template'
   - '!.test-tmp/**'
diff --git a/vitest.config.ts b/vitest.config.ts
index d69d95e4a..41cf36e30 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,6 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		projects: ['packages/*', 'community-addon-template']
+		projects: ['packages/*']
 	}
 });