diff --git a/rules/S104/metadata.json b/rules/S104/metadata.json
index 9fe14f4d2ed..3839edd97ad 100644
--- a/rules/S104/metadata.json
+++ b/rules/S104/metadata.json
@@ -13,6 +13,8 @@
     "constantCost": "1h"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S110/metadata.json b/rules/S110/metadata.json
index bedbfb94a8d..50858b40d54 100644
--- a/rules/S110/metadata.json
+++ b/rules/S110/metadata.json
@@ -15,6 +15,7 @@
     "linearFactor": "30min"
   },
   "tags": [
+    "architecture",
     "design"
   ],
   "extra": {
diff --git a/rules/S1200/metadata.json b/rules/S1200/metadata.json
index a175a2f3f3e..12776bb347a 100644
--- a/rules/S1200/metadata.json
+++ b/rules/S1200/metadata.json
@@ -13,6 +13,8 @@
     "constantCost": "2h"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S138/metadata.json b/rules/S138/metadata.json
index 90f187d6f80..51ca9e63f3e 100644
--- a/rules/S138/metadata.json
+++ b/rules/S138/metadata.json
@@ -13,6 +13,8 @@
     "constantCost": "20min"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S1448/metadata.json b/rules/S1448/metadata.json
index 1e2f5129beb..5ca6922718d 100644
--- a/rules/S1448/metadata.json
+++ b/rules/S1448/metadata.json
@@ -13,6 +13,8 @@
     "constantCost": "1h"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S1541/metadata.json b/rules/S1541/metadata.json
index d3cb87e75b5..1d5336ec4f0 100644
--- a/rules/S1541/metadata.json
+++ b/rules/S1541/metadata.json
@@ -15,6 +15,8 @@
     "linearFactor": "1min"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S2972/java/metadata.json b/rules/S2972/java/metadata.json
index 37e3d5c9df1..dae4ca2e171 100644
--- a/rules/S2972/java/metadata.json
+++ b/rules/S2972/java/metadata.json
@@ -13,6 +13,8 @@
     "constantCost": "20min"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S3776/metadata.json b/rules/S3776/metadata.json
index 7ac0a84e7ba..564c64639f3 100644
--- a/rules/S3776/metadata.json
+++ b/rules/S3776/metadata.json
@@ -15,6 +15,8 @@
     "linearFactor": "1min"
   },
   "tags": [
+    "architecture",
+    "design",
     "brain-overload"
   ],
   "extra": {
diff --git a/rules/S6627/metadata.json b/rules/S6627/metadata.json
index a8cda009e38..a0c8189f0d3 100644
--- a/rules/S6627/metadata.json
+++ b/rules/S6627/metadata.json
@@ -13,6 +13,8 @@
     "constantCost": "5min"
   },
   "tags": [
+    "architecture",
+    "design",
     "gradle"
   ],
   "defaultSeverity": "Major",
diff --git a/rules/S6861/javascript/metadata.json b/rules/S6861/javascript/metadata.json
index 018d9152397..4252e6cb0a6 100644
--- a/rules/S6861/javascript/metadata.json
+++ b/rules/S6861/javascript/metadata.json
@@ -6,7 +6,10 @@
     "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [],
+  "tags": [
+    "architecture",
+    "design"
+  ],
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-6861",
   "sqKey": "S6861",
@@ -26,4 +29,4 @@
     "js",
     "ts"
   ]
-}
\ No newline at end of file
+}
diff --git a/rules/S7060/javascript/metadata.json b/rules/S7060/javascript/metadata.json
index 02ef21d176c..f798ae31ee9 100644
--- a/rules/S7060/javascript/metadata.json
+++ b/rules/S7060/javascript/metadata.json
@@ -6,7 +6,10 @@
     "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [],
+  "tags": [
+    "architecture",
+    "design"
+  ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-7060",
   "sqKey": "S7060",
@@ -26,4 +29,4 @@
     "js",
     "ts"
   ]
-}
\ No newline at end of file
+}