diff --git a/assessment/pkg.go b/assessment/pkg.go
index c1c70238d..6476314bd 100644
--- a/assessment/pkg.go
+++ b/assessment/pkg.go
@@ -103,6 +103,9 @@ func PrepareForArchetype(tagResolver *TagResolver, archetype *model.Archetype, a
 	for _, t := range archetype.CriteriaTags {
 		tagSet.Add(t.ID)
 	}
+	for _, t := range archetype.Tags {
+		tagSet.Add(t.ID)
+	}
 
 	assessment.Sections, _ = json.Marshal(prepareSections(tagResolver, tagSet, sections))