diff --git a/checklists-ext/appservicewebapps_sg_checklist.en.json b/checklists-ext/appservicewebapps_sg_checklist.en.json
index 14c50f6f..818926c5 100644
--- a/checklists-ext/appservicewebapps_sg_checklist.en.json
+++ b/checklists-ext/appservicewebapps_sg_checklist.en.json
@@ -189,7 +189,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -198,25 +216,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -253,6 +253,6 @@
         "name": "App Service Web Apps Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azureapplicationgateway_sg_checklist.en.json b/checklists-ext/azureapplicationgateway_sg_checklist.en.json
index b385fd1b..69d22a2c 100644
--- a/checklists-ext/azureapplicationgateway_sg_checklist.en.json
+++ b/checklists-ext/azureapplicationgateway_sg_checklist.en.json
@@ -237,7 +237,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -246,25 +264,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -301,6 +301,6 @@
         "name": "Azure Application Gateway Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azureblobstorage_sg_checklist.en.json b/checklists-ext/azureblobstorage_sg_checklist.en.json
index 5bbc7dc1..7049be55 100644
--- a/checklists-ext/azureblobstorage_sg_checklist.en.json
+++ b/checklists-ext/azureblobstorage_sg_checklist.en.json
@@ -213,7 +213,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -222,25 +240,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -277,6 +277,6 @@
         "name": "Azure Blob Storage Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azureexpressroute_sg_checklist.en.json b/checklists-ext/azureexpressroute_sg_checklist.en.json
index e5d39641..e45d148e 100644
--- a/checklists-ext/azureexpressroute_sg_checklist.en.json
+++ b/checklists-ext/azureexpressroute_sg_checklist.en.json
@@ -213,7 +213,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -222,25 +240,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -277,6 +277,6 @@
         "name": "Azure Expressroute Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azurefiles_sg_checklist.en.json b/checklists-ext/azurefiles_sg_checklist.en.json
index 8a82026c..17a27e47 100644
--- a/checklists-ext/azurefiles_sg_checklist.en.json
+++ b/checklists-ext/azurefiles_sg_checklist.en.json
@@ -237,7 +237,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -246,25 +264,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -301,6 +301,6 @@
         "name": "Azure Files Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azurefirewall_sg_checklist.en.json b/checklists-ext/azurefirewall_sg_checklist.en.json
index a0f13d40..e9253e5b 100644
--- a/checklists-ext/azurefirewall_sg_checklist.en.json
+++ b/checklists-ext/azurefirewall_sg_checklist.en.json
@@ -373,7 +373,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -382,25 +400,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -437,6 +437,6 @@
         "name": "Azure Firewall Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azurefrontdoor_sg_checklist.en.json b/checklists-ext/azurefrontdoor_sg_checklist.en.json
index c8cd3baa..16f5336e 100644
--- a/checklists-ext/azurefrontdoor_sg_checklist.en.json
+++ b/checklists-ext/azurefrontdoor_sg_checklist.en.json
@@ -181,7 +181,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -190,25 +208,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -245,6 +245,6 @@
         "name": "Azure Front Door Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azurekubernetesservice_sg_checklist.en.json b/checklists-ext/azurekubernetesservice_sg_checklist.en.json
index fc363008..20d14cec 100644
--- a/checklists-ext/azurekubernetesservice_sg_checklist.en.json
+++ b/checklists-ext/azurekubernetesservice_sg_checklist.en.json
@@ -413,7 +413,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -422,25 +440,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -477,6 +477,6 @@
         "name": "Azure Kubernetes Service Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azuremachinelearning_sg_checklist.en.json b/checklists-ext/azuremachinelearning_sg_checklist.en.json
index c4d996e8..c2c3e302 100644
--- a/checklists-ext/azuremachinelearning_sg_checklist.en.json
+++ b/checklists-ext/azuremachinelearning_sg_checklist.en.json
@@ -269,7 +269,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -278,25 +296,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -333,6 +333,6 @@
         "name": "Azure Machine Learning Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/azureopenai_sg_checklist.en.json b/checklists-ext/azureopenai_sg_checklist.en.json
index 9c118be9..ef7b0920 100644
--- a/checklists-ext/azureopenai_sg_checklist.en.json
+++ b/checklists-ext/azureopenai_sg_checklist.en.json
@@ -109,7 +109,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -118,25 +136,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -173,6 +173,6 @@
         "name": "Azure Openai Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/virtualmachines_sg_checklist.en.json b/checklists-ext/virtualmachines_sg_checklist.en.json
index 1a18efd6..dd57b02a 100644
--- a/checklists-ext/virtualmachines_sg_checklist.en.json
+++ b/checklists-ext/virtualmachines_sg_checklist.en.json
@@ -229,7 +229,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -238,25 +256,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -293,6 +293,6 @@
         "name": "Virtual Machines Service Guide",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file
diff --git a/checklists-ext/wafsg_checklist.en.json b/checklists-ext/wafsg_checklist.en.json
index c07bf595..363690f6 100644
--- a/checklists-ext/wafsg_checklist.en.json
+++ b/checklists-ext/wafsg_checklist.en.json
@@ -5549,7 +5549,25 @@
     "categories": [],
     "waf": [
         {
-            "name": "Performance"
+            "name": "security"
+        },
+        {
+            "name": "performance"
+        },
+        {
+            "name": "Operations"
+        },
+        {
+            "name": "reliability"
+        },
+        {
+            "name": "Cost"
+        },
+        {
+            "name": "operations"
+        },
+        {
+            "name": "Reliability"
         },
         {
             "name": "Security"
@@ -5558,25 +5576,7 @@
             "name": "cost"
         },
         {
-            "name": "security"
-        },
-        {
-            "name": "performance"
-        },
-        {
-            "name": "reliability"
-        },
-        {
-            "name": "operations"
-        },
-        {
-            "name": "Operations"
-        },
-        {
-            "name": "Cost"
-        },
-        {
-            "name": "Reliability"
+            "name": "Performance"
         }
     ],
     "yesno": [
@@ -5613,6 +5613,6 @@
         "name": "WAF Service Guides",
         "waf": "all",
         "state": "preview",
-        "timestamp": "August 26, 2024"
+        "timestamp": "September 01, 2024"
     }
 }
\ No newline at end of file