diff --git a/nx.json b/nx.json
index bd6ef45f..44a5a9e8 100644
--- a/nx.json
+++ b/nx.json
@@ -63,28 +63,28 @@
       "tags": ["platform:web", "scope:repository", "type:data-access"]
     },
     "pmp-web-repository-repository-statistics-feature": {
-      "tags": ["platform:web", "scope:repository", "type:feature"]
+      "tags": ["platform:web", "scope:repository-statistics", "type:feature"]
     },
     "pmp-web-repository-repository-statistics-data-access": {
-      "tags": ["platform:web", "scope:repository", "type:data-access"]
+      "tags": ["platform:web", "scope:repository-statistics", "type:data-access"]
     },
     "pmp-web-repository-repositories-statistics-feature": {
-      "tags": ["platform:web", "scope:repository", "type:feature"]
+      "tags": ["platform:web", "scope:repositories-statistics", "type:feature"]
     },
     "pmp-web-repository-repositories-statistics-data-access": {
-      "tags": ["platform:web", "scope:repository", "type:data-access"]
+      "tags": ["platform:web", "scope:repositories-statistics", "type:data-access"]
     },
     "pmp-web-repository-reviewer-statistics-feature": {
-      "tags": ["platform:web", "scope:repository", "type:feature"]
+      "tags": ["platform:web", "scope:reviewer-statistics", "type:feature"]
     },
     "pmp-web-repository-reviewer-statistics-data-access": {
-      "tags": ["platform:web", "scope:repository", "type:data-access"]
+      "tags": ["platform:web", "scope:reviewer-statistics", "type:data-access"]
     },
     "pmp-web-repository-reviewers-statistics-feature": {
-      "tags": ["platform:web", "scope:repository", "type:feature"]
+      "tags": ["platform:web", "scope:reviewers-statistics", "type:feature"]
     },
     "pmp-web-repository-reviewers-statistics-data-access": {
-      "tags": ["platform:web", "scope:repository", "type:data-access"]
+      "tags": ["platform:web", "scope:reviewers-statistics", "type:data-access"]
     },
     "pmp-web-repository-domain": {
       "tags": ["platform:web", "scope:repository", "type:domain"]
@@ -93,10 +93,10 @@
       "tags": ["platform:web", "scope:repository", "type:shell"]
     },
     "pmp-web-repository-repository-settings-feature": {
-      "tags": ["platform:web", "scope:repository", "type:feature"]
+      "tags": ["platform:web", "scope:repository-settings", "type:feature"]
     },
     "pmp-web-repository-repository-settings-ui": {
-      "tags": ["platform:web", "scope:repository", "type:ui"]
+      "tags": ["platform:web", "scope:repository-settings", "type:ui"]
     },
     "server-repository-api-rest": {
       "tags": ["platform:server", "scope:repository", "type:api"]
diff --git a/tslint.json b/tslint.json
index c36eeaf9..3614aa4e 100644
--- a/tslint.json
+++ b/tslint.json
@@ -66,6 +66,57 @@
               "name:user-public",
               "scope:repository",
               "scope:shared",
+              "name:auth-public",
+              "scope:repositories-statistics"
+            ]
+          },
+          {
+            "sourceTag": "scope:repository-statistics",
+            "onlyDependOnLibsWithTags": [
+              "name:user-public",
+              "scope:repository",
+              "scope:repository-statistics",
+              "scope:shared",
+              "name:auth-public"
+            ]
+          },
+          {
+            "sourceTag": "scope:repositories-statistics",
+            "onlyDependOnLibsWithTags": [
+              "name:user-public",
+              "scope:repository",
+              "scope:repositories-statistics",
+              "scope:shared",
+              "name:auth-public"
+            ]
+          },
+          {
+            "sourceTag": "scope:reviewer-statistics",
+            "onlyDependOnLibsWithTags": [
+              "name:user-public",
+              "scope:repository",
+              "scope:reviewer-statistics",
+              "scope:shared",
+              "name:auth-public"
+            ]
+          },
+          {
+            "sourceTag": "scope:reviewers-statistics",
+            "onlyDependOnLibsWithTags": [
+              "name:user-public",
+              "scope:repository",
+              "scope:reviewers-statistics",
+              "scope:shared",
+              "name:auth-public"
+            ]
+          },
+          {
+            "sourceTag": "scope:repository-settings",
+            "onlyDependOnLibsWithTags": [
+              "name:user-public",
+              "scope:repository",
+              "scope:repository-settings",
+              "scope:shared",
               "name:auth-public"
             ]
           },