diff --git a/packages/cli/src/commands/new/new.ts b/packages/cli/src/commands/new/new.ts
index 827352232d..57a64631ab 100644
--- a/packages/cli/src/commands/new/new.ts
+++ b/packages/cli/src/commands/new/new.ts
@@ -99,7 +99,6 @@ export default async () => {
       },
     );
 
-    // update default templates
     // create additional actions
     // install to app
     // install to backend
diff --git a/packages/cli/templates/default-backend-plugin.yaml b/packages/cli/templates/default-backend-plugin.yaml
index c7a0aafa1c..f3f488e8c9 100644
--- a/packages/cli/templates/default-backend-plugin.yaml
+++ b/packages/cli/templates/default-backend-plugin.yaml
@@ -2,7 +2,7 @@
 description: A new backend plugin
 template: ./default-backend-plugin
 targetPath: plugins
+suffix: backend
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - owner
diff --git a/packages/cli/templates/default-common-plugin-package.yaml b/packages/cli/templates/default-common-plugin-package.yaml
index 7603faf6b5..7092a5373e 100644
--- a/packages/cli/templates/default-common-plugin-package.yaml
+++ b/packages/cli/templates/default-common-plugin-package.yaml
@@ -2,7 +2,7 @@
 description: A new isomorphic common plugin package
 template: ./default-common-plugin-package
 targetPath: plugins
+suffix: common
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - owner
diff --git a/packages/cli/templates/default-node-plugin-package.yaml b/packages/cli/templates/default-node-plugin-package.yaml
index c6e0e2ccaf..df1526ed19 100644
--- a/packages/cli/templates/default-node-plugin-package.yaml
+++ b/packages/cli/templates/default-node-plugin-package.yaml
@@ -2,7 +2,7 @@
 description: A new Node.js library plugin package
 template: ./default-node-plugin-package
 targetPath: plugins
+suffix: node
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - owner
diff --git a/packages/cli/templates/default-plugin.yaml b/packages/cli/templates/default-plugin.yaml
index aef105c9a4..23f711fdc6 100644
--- a/packages/cli/templates/default-plugin.yaml
+++ b/packages/cli/templates/default-plugin.yaml
@@ -3,6 +3,5 @@ description: A new frontend plugin
 template: ./default-plugin
 targetPath: plugins
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - owner
diff --git a/packages/cli/templates/default-react-plugin-package.yaml b/packages/cli/templates/default-react-plugin-package.yaml
index f65aa211ba..208bfbbf33 100644
--- a/packages/cli/templates/default-react-plugin-package.yaml
+++ b/packages/cli/templates/default-react-plugin-package.yaml
@@ -2,7 +2,7 @@
 description: A new web library plugin package
 template: ./default-react-plugin-package
 targetPath: plugins
+suffix: react
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - owner
diff --git a/packages/cli/templates/index.ts b/packages/cli/templates/index.ts
index 34de61d2c2..9295982f06 100644
--- a/packages/cli/templates/index.ts
+++ b/packages/cli/templates/index.ts
@@ -3,38 +3,38 @@ import { paths } from '../src/lib/paths';
 export default [
   {
     id: 'backend-module',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/default-backend-module.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/default-backend-module.yaml'),
   },
   {
     id: 'backend-plugin',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/default-backend-plugin.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/default-backend-plugin.yaml'),
   },
   {
     id: 'plugin-common',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/default-common-plugin-package.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/default-common-plugin-package.yaml'),
   },
   {
     id: 'plugin-node',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/default-node-plugin-package.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/default-node-plugin-package.yaml'),
   },
   {
     id: 'frontend-plugin', // changed from 'plugin'
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/default-plugin.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/default-plugin.yaml'),
   },
   {
     id: 'plugin-react',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/default-react-plugin-package.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/default-react-plugin-package.yaml'),
   },
   {
     id: 'node-library',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/node-library-package.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/node-library-package.yaml'),
   },
   {
     id: 'scaffolder-module',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/scaffolder-module.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/scaffolder-module.yaml'),
   },
   {
     id: 'web-library',
-    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/alpha/web-library-package.yaml'),
+    target: paths.resolveTargetRoot('node_modules/@backstage/cli/templates/web-library-package.yaml'),
   },
 ];
diff --git a/packages/cli/templates/node-library-package.yaml b/packages/cli/templates/node-library-package.yaml
index 75018ed770..a10b4126e5 100644
--- a/packages/cli/templates/node-library-package.yaml
+++ b/packages/cli/templates/node-library-package.yaml
@@ -2,7 +2,7 @@
 description: A new node-library package, exporting shared functionality for backend plugins and modules
 template: ./node-library-package
 targetPath: packages
+plugin: false
 prompts:
-  - id: test
-    prompt: Test prompt
-    default: test-default
+  - id
+  - owner
diff --git a/packages/cli/templates/web-library-package.yaml b/packages/cli/templates/web-library-package.yaml
index baff2b1c75..e6c35e9ca2 100644
--- a/packages/cli/templates/web-library-package.yaml
+++ b/packages/cli/templates/web-library-package.yaml
@@ -2,9 +2,7 @@
 description: A new web-library package, exporting shared functionality for frontend plugins
 template: ./web-library-package
 targetPath: packages
+plugin: false
 prompts:
   - id
-  - id: another-id
-    prompt: Provide another id
-    default: another-id-example
-    validate: backstage-id
+  - owner