diff --git a/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.test.ts b/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.test.ts
index 6b9576695a..568231f673 100644
--- a/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.test.ts
+++ b/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.test.ts
@@ -19,7 +19,7 @@ import { TemplateEntityProcessor } from './TemplateEntityProcessor';
 
 const mockLocation = { type: 'a', target: 'b' };
 const mockEntity: TemplateEntityV1beta3 = {
-  apiVersion: 'templates.backstage.io/v1beta3',
+  apiVersion: 'scaffolder.backstage.io/v1beta3',
   kind: 'Template',
   metadata: { name: 'n' },
   spec: {
diff --git a/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.ts b/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.ts
index dc11b6d86d..8bd741a4ce 100644
--- a/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.ts
+++ b/plugins/scaffolder-backend/src/processor/TemplateEntityProcessor.ts
@@ -56,7 +56,7 @@ export class TemplateEntityProcessor implements CatalogProcessor {
     const selfRef = getEntityName(entity);
 
     if (
-      entity.apiVersion === 'templates.backstage.io/v1beta3' &&
+      entity.apiVersion === 'scaffolder.backstage.io/v1beta3' &&
       entity.kind === 'Template'
     ) {
       const template = entity as TemplateEntityV1beta3;
diff --git a/plugins/scaffolder-common/src/Template.v1beta3.schema.json b/plugins/scaffolder-common/src/Template.v1beta3.schema.json
index afcc6dd011..6992e82f02 100644
--- a/plugins/scaffolder-common/src/Template.v1beta3.schema.json
+++ b/plugins/scaffolder-common/src/Template.v1beta3.schema.json
@@ -4,7 +4,7 @@
   "description": "A Template describes a scaffolding task for use with the Scaffolder. It describes the required parameters as well as a series of steps that will be taken to execute the scaffolding task.",
   "examples": [
     {
-      "apiVersion": "templates.backstage.io/v1beta3",
+      "apiVersion": "scaffolder.backstage.io/v1beta3",
       "kind": "Template",
       "metadata": {
         "name": "react-ssr-template",
@@ -68,7 +68,7 @@
       "required": ["spec"],
       "properties": {
         "apiVersion": {
-          "enum": ["templates.backstage.io/v1beta3"]
+          "enum": ["scaffolder.backstage.io/v1beta3"]
         },
         "kind": {
           "enum": ["Template"]
diff --git a/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts b/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts
index dd3080333f..7863b7b476 100644
--- a/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts
+++ b/plugins/scaffolder-common/src/TemplateEntityV1beta3.test.ts
@@ -25,7 +25,7 @@ describe('templateEntityV1beta3Validator', () => {
 
   beforeEach(() => {
     entity = {
-      apiVersion: 'templates.backstage.io/v1beta3',
+      apiVersion: 'scaffolder.backstage.io/v1beta3',
       kind: 'Template',
       metadata: {
         name: 'test',
diff --git a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
index ebad23f94a..6471fe0ca6 100644
--- a/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
+++ b/plugins/scaffolder-common/src/TemplateEntityV1beta3.ts
@@ -19,7 +19,7 @@ import { Entity } from '@backstage/catalog-model';
 
 /** @public */
 export interface TemplateEntityV1beta3 extends Entity {
-  apiVersion: 'templates.backstage.io/v1beta3';
+  apiVersion: 'scaffolder.backstage.io/v1beta3';
   kind: 'Template';
   spec: {
     type: string;