diff --git a/packages/cli/templates/backend-plugin-module/portable-template.yaml b/packages/cli/templates/backend-plugin-module/portable-template.yaml
index db424be55f..b929d84591 100644
--- a/packages/cli/templates/backend-plugin-module/portable-template.yaml
+++ b/packages/cli/templates/backend-plugin-module/portable-template.yaml
@@ -1,5 +1,5 @@
 name: backend-plugin-module
 role: backend-plugin-module
 description: A new backend module that extends an existing backend plugin
-templateValues:
+values:
   moduleVar: '{{ camelCase pluginId }}Module{{ upperFirst ( camelCase moduleId ) }}'
diff --git a/packages/cli/templates/backend-plugin/portable-template.yaml b/packages/cli/templates/backend-plugin/portable-template.yaml
index dd7d7386e7..d305ea77f3 100644
--- a/packages/cli/templates/backend-plugin/portable-template.yaml
+++ b/packages/cli/templates/backend-plugin/portable-template.yaml
@@ -1,5 +1,5 @@
 name: backend-plugin
 role: backend-plugin
 description: A new backend plugin
-templateValues:
+values:
   pluginVar: '{{ camelCase pluginId }}Plugin'
diff --git a/packages/cli/templates/frontend-plugin/portable-template.yaml b/packages/cli/templates/frontend-plugin/portable-template.yaml
index 454079c117..3afb60eb22 100644
--- a/packages/cli/templates/frontend-plugin/portable-template.yaml
+++ b/packages/cli/templates/frontend-plugin/portable-template.yaml
@@ -1,6 +1,6 @@
 name: frontend-plugin
 role: frontend-plugin
 description: A new frontend plugin
-templateValues:
+values:
   pluginVar: '{{ camelCase pluginId }}Plugin'
   extensionName: '{{ upperFirst ( camelCase pluginId ) }}Page'
diff --git a/packages/cli/templates/scaffolder-backend-module/portable-template.yaml b/packages/cli/templates/scaffolder-backend-module/portable-template.yaml
index f223686a7b..a131c14062 100644
--- a/packages/cli/templates/scaffolder-backend-module/portable-template.yaml
+++ b/packages/cli/templates/scaffolder-backend-module/portable-template.yaml
@@ -1,7 +1,6 @@
 name: scaffolder-backend-module
 role: backend-plugin-module
 description: A module exporting custom actions for @backstage/plugin-scaffolder-backend
-parameters:
+values:
   pluginId: scaffolder
-templateValues:
   moduleVar: '{{ camelCase pluginId }}Module{{ upperFirst ( camelCase moduleId ) }}'