diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 56c371e825..89710a6e34 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -27,6 +27,7 @@ import {
   EntityKindPicker,
   EntityListProvider,
   EntitySearchBar,
+  EntityTagPicker,
   EntityTypePicker,
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
@@ -90,7 +91,7 @@ export const ScaffolderPageContents = () => {
             />
             {/* TODO(mtlewis) replace with custom checkbox list? maybe multiselect */}
             <EntityTypePicker />
-            {/* TODO(mtlewis) consider adding tag picker?  */}
+            <EntityTagPicker />
           </div>
           <div>
             <TemplateList />