diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
index 058e2a715f..124d1575ce 100644
--- a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template.yaml
@@ -4,8 +4,9 @@ metadata:
   name: react-ssr-template
   title: React SSR Template
   description: Next.js application skeleton for creating isomorphic web applications.
-  annotations:
-    tags: Recommended,React
+  tags:
+    - Recommended
+    - React
 spec:
   processor: cookiecutter
   type: website
diff --git a/plugins/scaffolder-backend/sample-templates/springboot-template/template.yaml b/plugins/scaffolder-backend/sample-templates/springboot-template/template.yaml
index d44d926ef4..681e8e7f51 100644
--- a/plugins/scaffolder-backend/sample-templates/springboot-template/template.yaml
+++ b/plugins/scaffolder-backend/sample-templates/springboot-template/template.yaml
@@ -4,8 +4,9 @@ metadata:
   name: springboot-template
   title: Spring Boot Service
   description: Standard Spring Boot (Java) microservice with recommended configuration.
-  annotations:
-    tags: Recommended,Java
+  tags:
+    - Recommended
+    - Java
 spec:
   processor: cookiecutter
   type: service
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
index a6dbac8f83..aa2a8b639a 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
@@ -103,8 +103,7 @@ const ScaffolderPage: React.FC<{}> = () => {
                     }`}
                     type={template.spec.type ?? ''}
                     description={template.metadata.description ?? '-'}
-                    // TODO(shmidt-i): how to store tags
-                    tags={template.metadata.annotations?.tags.split(',') ?? []}
+                    tags={template.metadata?.tags ?? []}
                   />
                 </Grid>
               );