diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
index 64693ad006831..a1aa34891dd94 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -1,11 +1,11 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json
index b594c16f02c92..5974fb1e6ee85 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
index 6ebe1539d108d..89f318ad08132 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
index eca299266d2f6..325c6357096d5 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json
index d8b9483672dc9..4188470df6ab5 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json
@@ -1,11 +1,11 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "config": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
index d1d7042bd13de..f3800f826f87e 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
@@ -1,11 +1,11 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json
index 340bcb05a012f..8a1a3f6f49702 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json
index 3c113133cead4..90082d1ed0979 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json
index 9108c5c337fb9..a5c55c136a003 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json
index 68fee15a35fc9..90afb3eb6000b 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json
@@ -1,10 +1,10 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
@@ -38,6 +38,11 @@
         },
         "autoUpgradeProfile": {
           "upgradeChannel": "stable"
+        },
+        "nginxAppProtect": {
+          "webApplicationFirewallSettings": {
+            "activationState": "Enabled"
+          }
         }
       },
       "location": "West US"
@@ -82,6 +87,29 @@
           },
           "autoUpgradeProfile": {
             "upgradeChannel": "stable"
+          },
+          "nginxAppProtect": {
+            "webApplicationFirewallSettings": {
+              "activationState": "Enabled"
+            },
+            "webApplicationFirewallStatus": {
+              "attackSignaturesPackage": {
+                "version": "2024.02.21",
+                "revisionDatetime": "2024-02-21T15:50:53Z"
+              },
+              "botSignaturesPackage": {
+                "version": "2024.02.22",
+                "revisionDatetime": "2024-02-22T15:50:53Z"
+              },
+              "threatCampaignsPackage": {
+                "version": "2024.02.23",
+                "revisionDatetime": "2024-02-23T15:50:53Z"
+              },
+              "componentVersions": {
+                "wafEngineVersion": "10.624.0",
+                "wafNginxVersion": "4.815.0"
+              }
+            }
           }
         }
       }
@@ -124,6 +152,11 @@
           },
           "autoUpgradeProfile": {
             "upgradeChannel": "stable"
+          },
+          "nginxAppProtect": {
+            "webApplicationFirewallSettings": {
+              "activationState": "Enabled"
+            }
           }
         }
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json
index f2561ac79b3b4..c20611a09bcee 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json
index 94385af6e9d63..8957c8d5e4864 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment"
@@ -43,6 +43,29 @@
           },
           "autoUpgradeProfile": {
             "upgradeChannel": "stable"
+          },
+          "nginxAppProtect": {
+            "webApplicationFirewallSettings": {
+              "activationState": "Enabled"
+            },
+            "webApplicationFirewallStatus": {
+              "attackSignaturesPackage": {
+                "version": "2024.02.21",
+                "revisionDatetime": "2024-02-21T15:50:53Z"
+              },
+              "botSignaturesPackage": {
+                "version": "2024.02.22",
+                "revisionDatetime": "2024-02-22T15:50:53Z"
+              },
+              "threatCampaignsPackage": {
+                "version": "2024.02.23",
+                "revisionDatetime": "2024-02-23T15:50:53Z"
+              },
+              "componentVersions": {
+                "wafEngineVersion": "10.624.0",
+                "wafNginxVersion": "4.815.0"
+              }
+            }
           }
         }
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
index f80054231df42..63e512353196c 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json
index 4533de943addb..3fad2eac5f873 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000"
   },
   "responses": {
@@ -41,6 +41,29 @@
               },
               "autoUpgradeProfile": {
                 "upgradeChannel": "stable"
+              },
+              "nginxAppProtect": {
+                "webApplicationFirewallSettings": {
+                  "activationState": "Enabled"
+                },
+                "webApplicationFirewallStatus": {
+                  "attackSignaturesPackage": {
+                    "version": "2024.02.21",
+                    "revisionDatetime": "2024-02-21T15:50:53Z"
+                  },
+                  "botSignaturesPackage": {
+                    "version": "2024.02.22",
+                    "revisionDatetime": "2024-02-22T15:50:53Z"
+                  },
+                  "threatCampaignsPackage": {
+                    "version": "2024.02.23",
+                    "revisionDatetime": "2024-02-23T15:50:53Z"
+                  },
+                  "componentVersions": {
+                    "wafEngineVersion": "10.624.0",
+                    "wafNginxVersion": "4.815.0"
+                  }
+                }
               }
             }
           }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
index e6feb26bd6a66..898d1f5d2de23 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup"
   },
@@ -42,6 +42,29 @@
               },
               "autoUpgradeProfile": {
                 "upgradeChannel": "stable"
+              },
+              "nginxAppProtect": {
+                "webApplicationFirewallSettings": {
+                  "activationState": "Enabled"
+                },
+                "webApplicationFirewallStatus": {
+                  "attackSignaturesPackage": {
+                    "version": "2024.02.21",
+                    "revisionDatetime": "2024-02-21T15:50:53Z"
+                  },
+                  "botSignaturesPackage": {
+                    "version": "2024.02.22",
+                    "revisionDatetime": "2024-02-22T15:50:53Z"
+                  },
+                  "threatCampaignsPackage": {
+                    "version": "2024.02.23",
+                    "revisionDatetime": "2024-02-23T15:50:53Z"
+                  },
+                  "componentVersions": {
+                    "wafEngineVersion": "10.624.0",
+                    "wafNginxVersion": "4.815.0"
+                  }
+                }
               }
             }
           }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json
index dcf8064cfa6e1..a3a73b8f7f295 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json
@@ -1,12 +1,19 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview",
+    "api-version": "2024-06-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "tags": {
         "Environment": "Dev"
+      },
+      "properties": {
+        "nginxAppProtect": {
+          "webApplicationFirewallSettings": {
+            "activationState": "Enabled"
+          }
+        }
       }
     }
   },
@@ -52,6 +59,29 @@
           },
           "autoUpgradeProfile": {
             "upgradeChannel": "stable"
+          },
+          "nginxAppProtect": {
+            "webApplicationFirewallSettings": {
+              "activationState": "Enabled"
+            },
+            "webApplicationFirewallStatus": {
+              "attackSignaturesPackage": {
+                "version": "2024.02.21",
+                "revisionDatetime": "2024-02-21T15:50:53Z"
+              },
+              "botSignaturesPackage": {
+                "version": "2024.02.22",
+                "revisionDatetime": "2024-02-22T15:50:53Z"
+              },
+              "threatCampaignsPackage": {
+                "version": "2024.02.23",
+                "revisionDatetime": "2024-02-23T15:50:53Z"
+              },
+              "componentVersions": {
+                "wafEngineVersion": "10.624.0",
+                "wafNginxVersion": "4.815.0"
+              }
+            }
           }
         }
       }
@@ -93,6 +123,11 @@
           },
           "autoUpgradeProfile": {
             "upgradeChannel": "stable"
+          },
+          "nginxAppProtect": {
+            "webApplicationFirewallSettings": {
+              "activationState": "Enabled"
+            }
           }
         }
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json
index 20196292a94e0..9c10025050e87 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2024-01-01-preview"
+    "api-version": "2024-06-01-preview"
   },
   "responses": {
     "200": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
index a8783433f0203..a1be5464bdbb8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
@@ -1680,7 +1680,7 @@
           "description": "The activation state of the WAF. Use 'Enabled' to enable the WAF and 'Disabled' to disable it.",
           "x-ms-enum": {
             "modelAsString": true,
-            "name": "activationState"
+            "name": "WebApplicationFirewallSettings"
           }
         }
       }
diff --git a/specification/nginx/resource-manager/readme.md b/specification/nginx/resource-manager/readme.md
index fae576143fd17..f0c856bcfc5cc 100644
--- a/specification/nginx/resource-manager/readme.md
+++ b/specification/nginx/resource-manager/readme.md
@@ -28,7 +28,16 @@ These are the global settings for the Nginx API.
 title: NginxManagementClient
 openapi-type: arm
 openapi-subtype: rpaas
-tag: package-2024-01-01-preview
+tag: package-preview-2024-09-01
+```
+
+### Tag: package-preview-2024-09-01
+
+These settings apply only when `--tag=package-preview-2024-09-01` is specified on the command line.
+
+```yaml $(tag) == 'package-preview-2024-09-01'
+input-file:
+  - NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
 ```
 
 ### Tag: package-2024-01-01-preview