diff --git a/products/terraform/docs/swfw/aws/cloudngfw/modules.mdx b/products/terraform/docs/swfw/aws/cloudngfw/modules.mdx
new file mode 100644
index 000000000..6f3463795
--- /dev/null
+++ b/products/terraform/docs/swfw/aws/cloudngfw/modules.mdx
@@ -0,0 +1,26 @@
+---
+id: modules
+title: AWS
+sidebar_label: AWS - Cloud NGFW
+hide_title: true
+description: AWS
+pagination_next: null
+pagination_prev: null
+keywords:
+  - pan-os
+  - panos
+  - firewall
+  - configuration
+  - terraform
+  - cloudngfw
+---
+
+# AWS Cloud NGFW - Modules
+
+import ModulesIntro from '../../_modules-intro-cloudngfw.mdx';
+
+<ModulesIntro cloudname="AWS" />
+
+import DocCardList from '@theme/DocCardList';
+
+<DocCardList />
diff --git a/products/terraform/docs/swfw/aws/cloudngfw/overview.mdx b/products/terraform/docs/swfw/aws/cloudngfw/overview.mdx
index 1a7b4f122..e6ebd2421 100644
--- a/products/terraform/docs/swfw/aws/cloudngfw/overview.mdx
+++ b/products/terraform/docs/swfw/aws/cloudngfw/overview.mdx
@@ -1,7 +1,7 @@
 ---
 id: overview
 title: AWS - CloudNGFW
-sidebar_label: AWS - CloudNGFW (coming soon)
+sidebar_label: AWS - CloudNGFW
 hide_title: true
 description: AWS - CloudNGFW
 pagination_next: null
diff --git a/products/terraform/docs/swfw/aws/cloudngfw/reference-architectures.mdx b/products/terraform/docs/swfw/aws/cloudngfw/reference-architectures.mdx
new file mode 100644
index 000000000..6328cbe27
--- /dev/null
+++ b/products/terraform/docs/swfw/aws/cloudngfw/reference-architectures.mdx
@@ -0,0 +1,27 @@
+---
+id: reference-architectures
+title: AWS
+sidebar_label: AWS - Cloud NGFW
+hide_title: true
+description: AWS
+pagination_next: null
+pagination_prev: null
+keywords:
+  - pan-os
+  - panos
+  - firewall
+  - configuration
+  - terraform
+  - vmseries
+  - vm-series
+---
+
+# AWS Cloud NGFW - Reference Architectures
+
+import ReferenceArchitectureIntro from '../../_ref-arch-intro-cloudngfw.mdx';
+
+<ReferenceArchitectureIntro cloudname="AWS" />
+
+import DocCardList from '@theme/DocCardList';
+
+<DocCardList />
diff --git a/products/terraform/docs/swfw/azure/cloudngfw/modules.mdx b/products/terraform/docs/swfw/azure/cloudngfw/modules.mdx
new file mode 100644
index 000000000..167a07723
--- /dev/null
+++ b/products/terraform/docs/swfw/azure/cloudngfw/modules.mdx
@@ -0,0 +1,27 @@
+---
+id: modules
+title: Azure
+sidebar_label: Azure - CloudNGFW
+hide_title: true
+description: Azure
+pagination_next: null
+pagination_prev: null
+keywords:
+  - pan-os
+  - panos
+  - firewall
+  - configuration
+  - terraform
+  - cloudngfw
+  - azure
+---
+
+# Azure CloudNGFW - Modules
+
+import ModulesIntro from '../../_modules-intro-cloudngfw.mdx';
+
+<ModulesIntro cloudname="Azure" />
+
+import DocCardList from '@theme/DocCardList';
+
+<DocCardList />
diff --git a/products/terraform/docs/swfw/azure/cloudngfw/overview.mdx b/products/terraform/docs/swfw/azure/cloudngfw/overview.mdx
index b5b0ef650..82d299eab 100644
--- a/products/terraform/docs/swfw/azure/cloudngfw/overview.mdx
+++ b/products/terraform/docs/swfw/azure/cloudngfw/overview.mdx
@@ -1,7 +1,7 @@
 ---
 id: overview
 title: Azure
-sidebar_label: Azure - CloudNGFW (coming soon)
+sidebar_label: Azure - CloudNGFW
 hide_title: true
 description: AAzureWS
 pagination_next: null
diff --git a/products/terraform/docs/swfw/azure/cloudngfw/reference-architectures.mdx b/products/terraform/docs/swfw/azure/cloudngfw/reference-architectures.mdx
new file mode 100644
index 000000000..f889e0d71
--- /dev/null
+++ b/products/terraform/docs/swfw/azure/cloudngfw/reference-architectures.mdx
@@ -0,0 +1,30 @@
+---
+id: reference-architectures
+title: Azure
+sidebar_label: Azure - CloudNGFW
+hide_title: true
+description: Azure
+pagination_next: null
+pagination_prev: null
+keywords:
+  - pan-os
+  - panos
+  - firewall
+  - configuration
+  - terraform
+  - vmseries
+  - vm-series
+  - azure
+---
+
+# Azure CloudNGFW - Reference Architectures
+
+![Azure](/img/azure.png)
+
+import ReferenceArchitectureIntro from '../../_ref-arch-intro-cloudngfw.mdx';
+
+<ReferenceArchitectureIntro cloudname="Azure" />
+
+import DocCardList from '@theme/DocCardList';
+
+<DocCardList />
diff --git a/products/terraform/sidebars.ts b/products/terraform/sidebars.ts
index 41e5d61ee..444394628 100644
--- a/products/terraform/sidebars.ts
+++ b/products/terraform/sidebars.ts
@@ -167,37 +167,37 @@ module.exports = {
         },
       ],
     },
-    // "terraform/docs/swfw/aws/cloudngfw/overview",
-    // {
-    //   type: "category",
-    //   collapsed: true,
-    //   label: "Reference Architectures",
-    //   link: {
-    //     type: "doc",
-    //     id: "terraform/docs/swfw/aws/cloudngfw/reference-architectures",
-    //   },
-    //   items: [
-    //     {
-    //       type: "autogenerated",
-    //       dirName: "terraform/docs/swfw/aws/cloudngfw/reference-architectures",
-    //     },
-    //   ],
-    // },
-    // {
-    //   type: "category",
-    //   collapsed: true,
-    //   label: "Modules",
-    //   link: {
-    //     type: "doc",
-    //     id: "terraform/docs/swfw/aws/cloudngfw/modules",
-    //   },
-    //   items: [
-    //     {
-    //       type: "autogenerated",
-    //       dirName: "terraform/docs/swfw/aws/cloudngfw/modules",
-    //     },
-    //   ],
-    // },
+    "terraform/docs/swfw/aws/cloudngfw/overview",
+    {
+      type: "category",
+      collapsed: true,
+      label: "Reference Architectures",
+      link: {
+        type: "doc",
+        id: "terraform/docs/swfw/aws/cloudngfw/reference-architectures",
+      },
+      items: [
+        {
+          type: "autogenerated",
+          dirName: "terraform/docs/swfw/aws/cloudngfw/reference-architectures",
+        },
+      ],
+    },
+    {
+      type: "category",
+      collapsed: true,
+      label: "Modules",
+      link: {
+        type: "doc",
+        id: "terraform/docs/swfw/aws/cloudngfw/modules",
+      },
+      items: [
+        {
+          type: "autogenerated",
+          dirName: "terraform/docs/swfw/aws/cloudngfw/modules",
+        },
+      ],
+    },
   ],
   terraform_swfw_azure: [
     "terraform/docs/swfw/azure/vmseries/overview",
@@ -246,38 +246,38 @@ module.exports = {
         },
       ],
     },
-    // "terraform/docs/swfw/azure/cloudngfw/overview",
-    // {
-    //   type: "category",
-    //   collapsed: true,
-    //   label: "Reference Architectures",
-    //   link: {
-    //     type: "doc",
-    //     id: "terraform/docs/swfw/azure/cloudngfw/reference-architectures",
-    //   },
-    //   items: [
-    //     {
-    //       type: "autogenerated",
-    //       dirName:
-    //         "terraform/docs/swfw/azure/cloudngfw/reference-architectures",
-    //     },
-    //   ],
-    // },
-    // {
-    //   type: "category",
-    //   collapsed: true,
-    //   label: "Modules",
-    //   link: {
-    //     type: "doc",
-    //     id: "terraform/docs/swfw/azure/cloudngfw/modules",
-    //   },
-    //   items: [
-    //     {
-    //       type: "autogenerated",
-    //       dirName: "terraform/docs/swfw/azure/cloudngfw/modules",
-    //     },
-    //   ],
-    // },
+    "terraform/docs/swfw/azure/cloudngfw/overview",
+    {
+      type: "category",
+      collapsed: true,
+      label: "Reference Architectures",
+      link: {
+        type: "doc",
+        id: "terraform/docs/swfw/azure/cloudngfw/reference-architectures",
+      },
+      items: [
+        {
+          type: "autogenerated",
+          dirName:
+            "terraform/docs/swfw/azure/cloudngfw/reference-architectures",
+        },
+      ],
+    },
+    {
+      type: "category",
+      collapsed: true,
+      label: "Modules",
+      link: {
+        type: "doc",
+        id: "terraform/docs/swfw/azure/cloudngfw/modules",
+      },
+      items: [
+        {
+          type: "autogenerated",
+          dirName: "terraform/docs/swfw/azure/cloudngfw/modules",
+        },
+      ],
+    },
   ],
   terraform_swfw_gcp: [
     "terraform/docs/swfw/gcp/vmseries/overview",