diff --git a/per-rule/main.fmf b/per-rule/main.fmf
index c64aee17..df3ba1cf 100644
--- a/per-rule/main.fmf
+++ b/per-rule/main.fmf
@@ -52,6 +52,8 @@ tag:
         id: 237c1eaf-bf68-4eba-b097-6cc0222ca282
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/from-env/ansible
+        extra-nitrate: TC#0617448
+        id: 0ddf3a59-be7c-4511-82ac-71a6efe4544e
 
 /1:
     /oscap:
@@ -60,6 +62,8 @@ tag:
         id: ccef824b-20d1-4509-8bae-8553f67608db
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/1/ansible
+        extra-nitrate: TC#0617433
+        id: 62e723ca-103e-4e87-b0dd-a76af38a4132
 
 /2:
     /oscap:
@@ -68,6 +72,8 @@ tag:
         id: b42e38dd-3b5d-4901-867e-1715eaf9aa95
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/2/ansible
+        extra-nitrate: TC#0617440
+        id: 2e6e47eb-3567-4f0d-baee-0cb7e606a36c
 
 /3:
     /oscap:
@@ -76,6 +82,8 @@ tag:
         id: 94e30407-823f-4c06-a47c-2c4bf8f1d356
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/3/ansible
+        extra-nitrate: TC#0617441
+        id: e2f6b558-9cf1-4943-b6d5-3964273ea852
 
 /4:
     /oscap:
@@ -84,6 +92,8 @@ tag:
         id: 9c6f132b-ebbf-42cd-b914-ac3f8fa6aa90
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/4/ansible
+        extra-nitrate: TC#0617442
+        id: 6bea4901-eb10-48f4-8349-4aa801e8f78c
 
 /5:
     /oscap:
@@ -92,6 +102,8 @@ tag:
         id: bf193dd8-c102-4659-9935-45106f06dd0b
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/5/ansible
+        extra-nitrate: TC#0617443
+        id: 216e2550-03b6-41ec-b6fd-e31dfa5e91bf
 
 /6:
     /oscap:
@@ -100,6 +112,8 @@ tag:
         id: 6adea628-3166-4b33-aa04-ab910ed997b2
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/6/ansible
+        extra-nitrate: TC#0617444
+        id: 12b75ece-619c-489d-95a0-b4b0cae0de73
 
 /7:
     /oscap:
@@ -108,6 +122,8 @@ tag:
         id: fb780940-e9f7-4864-b4f7-6caabfdec066
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/7/ansible
+        extra-nitrate: TC#0617445
+        id: c21a5eaa-bcaa-4784-a988-c44cb240eda6
 
 /8:
     /oscap:
@@ -116,6 +132,8 @@ tag:
         id: 1bc5fcef-3e5a-43a8-b9de-532a87bad95b
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/8/ansible
+        extra-nitrate: TC#0617446
+        id: 76aff506-8425-4bb6-acd0-28a315651884
 
 /9:
     /oscap:
@@ -124,6 +142,8 @@ tag:
         id: c82b9968-e5b9-4570-b04b-f11d9565c234
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/9/ansible
+        extra-nitrate: TC#0617447
+        id: 632ad14f-8823-4f96-aee0-640de8c72b98
 
 /10:
     /oscap:
@@ -132,6 +152,8 @@ tag:
         id: d6b4651f-43c9-4836-9ddd-9b426f753b77
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/10/ansible
+        extra-nitrate: TC#0617434
+        id: e85ea7df-ce8b-432f-8c27-ca589ee3e7f5
 
 /11:
     /oscap:
@@ -140,6 +162,8 @@ tag:
         id: 3c58f725-0e34-4a53-9b47-653d47c7e49a
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/11/ansible
+        extra-nitrate: TC#0617435
+        id: e6afe2ab-64d9-4d7e-a676-71abdfa8fa79
 
 /12:
     /oscap:
@@ -148,6 +172,8 @@ tag:
         id: 7c90efc8-59b5-4d45-b8ed-ca381b106fcb
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/12/ansible
+        extra-nitrate: TC#0617436
+        id: 5aa4dcb3-c395-4e67-ab68-1eb8bb86a7fc
 
 /13:
     /oscap:
@@ -156,6 +182,8 @@ tag:
         id: 0f496d79-4fef-4338-8ca1-93fb21ed5d6f
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/13/ansible
+        extra-nitrate: TC#0617437
+        id: 96fb9dce-8db5-4aaf-9276-46bfc6378c66
 
 /14:
     /oscap:
@@ -164,6 +192,8 @@ tag:
         id: 330f74dc-8851-4e45-b23a-0637037ace08
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/14/ansible
+        extra-nitrate: TC#0617438
+        id: f0009f19-ed96-4da7-9951-f837fdc3d891
 
 /15:
     /oscap:
@@ -172,3 +202,5 @@ tag:
         id: 82cdc8da-bf6c-4996-8e72-bcb83cd85050
     /ansible:
         extra-summary: /CoreOS/scap-security-guide/per-rule/15/ansible
+        extra-nitrate: TC#0617439
+        id: a46774b5-e751-4c7b-8dfe-7f1a3232cc0f
diff --git a/static-checks/diff/main.fmf b/static-checks/diff/main.fmf
index ef91b590..264f9b9b 100644
--- a/static-checks/diff/main.fmf
+++ b/static-checks/diff/main.fmf
@@ -11,22 +11,37 @@ adjust:
     summary: Diff datastreams, output added/removed profiles
     test: python3 -m lib.runtest ./profiles.py
     tag: [NoProductization]
+    extra-summary: /CoreOS/scap-security-guide/static-checks/diff/profiles
+    extra-nitrate: TC#0617452
+    id: 5f0d1df1-f2b5-4212-84e7-2c25ec5566c1
 
 /profile-titles:
     summary: Diff datastreams, output profile title differences
     test: python3 -m lib.runtest ./profile-titles.py
     tag: [NoProductization]
+    extra-summary: /CoreOS/scap-security-guide/static-checks/diff/profile-titles
+    extra-nitrate: TC#0617450
+    id: 9e43b634-eaab-4e4f-81c2-bbab571f7db1
 
 /profile-rules:
     summary: Diff datastreams, output profile rule/variable differences
     test: python3 -m lib.runtest ./profile-rules.py
     tag: [NoProductization]
+    extra-summary: /CoreOS/scap-security-guide/static-checks/diff/profile-rules
+    extra-nitrate: TC#0617449
+    id: d17358be-d702-4786-a9df-6716036c8428
 
 /profile-variables:
     summary: Diff datastreams, output profile variable refine differences
     test: python3 -m lib.runtest ./profile-variables.py
     tag: [NoProductization]
+    extra-summary: /CoreOS/scap-security-guide/static-checks/diff/profile-variables
+    extra-nitrate: TC#0617451
+    id: dd504436-0d67-4f1c-96f4-faeff18a2c0c
 
 /removed-rules:
     summary: Diff datastreams, check that no rule has been removed
     test: python3 -m lib.runtest ./removed-rules.py
+    extra-summary: /CoreOS/scap-security-guide/static-checks/diff/removed-rules
+    extra-nitrate: TC#0617453
+    id: 6dfdc617-53f7-45de-af41-feeb9ae991ea