diff --git a/docs/content/indexes/bicep/bicep-pattern-modules.md b/docs/content/indexes/bicep/bicep-pattern-modules.md
index c3e409b90..9b2d6cd45 100644
--- a/docs/content/indexes/bicep/bicep-pattern-modules.md
+++ b/docs/content/indexes/bicep/bicep-pattern-modules.md
@@ -69,11 +69,10 @@ The following table shows the number of all available, orphaned and proposed **B
### All modules - 📇
-{{< expand "âž• All Modules - Module names, status and owners" "expand/collapse" >}}
-
+
+ âž• All Modules - Module names, status and owners
{{< moduleNameStatusOwners header=true csv="/static/module-indexes/BicepPatternModules.csv" language="Bicep" moduleType="pattern" >}}
-
-{{< /expand >}}
+
diff --git a/docs/content/indexes/bicep/bicep-resource-modules.md b/docs/content/indexes/bicep/bicep-resource-modules.md
index dbf0a533c..fa0216794 100644
--- a/docs/content/indexes/bicep/bicep-resource-modules.md
+++ b/docs/content/indexes/bicep/bicep-resource-modules.md
@@ -69,11 +69,10 @@ The following table shows the number of all available, orphaned and proposed **B
### All modules - 📇
-{{< expand "âž• All Modules - Module names, status and owners" "expand/collapse" >}}
-
+
+ âž• All Modules - Module names, status and owners
{{< moduleNameStatusOwners header=true csv="/static/module-indexes/BicepResourceModules.csv" language="Bicep" moduleType="resource" >}}
-
-{{< /expand >}}
+
diff --git a/docs/content/indexes/bicep/bicep-utility-modules.md b/docs/content/indexes/bicep/bicep-utility-modules.md
index e31532b57..c9a4b559c 100644
--- a/docs/content/indexes/bicep/bicep-utility-modules.md
+++ b/docs/content/indexes/bicep/bicep-utility-modules.md
@@ -69,11 +69,10 @@ The following table shows the number of all available, orphaned and proposed **B
### All modules - 📇
-{{< expand "âž• All Modules - Module names, status and owners" "expand/collapse" >}}
-
+
+ âž• All Modules - Module names, status and owners
{{< moduleNameStatusOwners header=true csv="/static/module-indexes/BicepUtilityModules.csv" language="Bicep" moduleType="utility" >}}
-
-{{< /expand >}}
+
diff --git a/docs/content/indexes/terraform/tf-pattern-modules.md b/docs/content/indexes/terraform/tf-pattern-modules.md
index 8cf802d7d..c06aef6bf 100644
--- a/docs/content/indexes/terraform/tf-pattern-modules.md
+++ b/docs/content/indexes/terraform/tf-pattern-modules.md
@@ -69,11 +69,10 @@ The following table shows the number of all available, orphaned and proposed **T
### All modules - 📇
-{{< expand "âž• All Modules - Module names, status and owners" "expand/collapse" >}}
-
+
+ âž• All Modules - Module names, status and owners
{{< moduleNameStatusOwners header=true csv="/static/module-indexes/TerraformPatternModules.csv" language="Terraform" moduleType="pattern" >}}
-
-{{< /expand >}}
+
diff --git a/docs/content/indexes/terraform/tf-resource-modules.md b/docs/content/indexes/terraform/tf-resource-modules.md
index d868ec590..967add1cc 100644
--- a/docs/content/indexes/terraform/tf-resource-modules.md
+++ b/docs/content/indexes/terraform/tf-resource-modules.md
@@ -69,11 +69,10 @@ The following table shows the number of all available, orphaned and proposed **T
### All modules - 📇
-{{< expand "âž• All Modules - Module names, status and owners" "expand/collapse" >}}
-
+
+ âž• All Modules - Module names, status and owners
{{< moduleNameStatusOwners header=true csv="/static/module-indexes/TerraformResourceModules.csv" language="Terraform" moduleType="resource" >}}
-
-{{< /expand >}}
+
diff --git a/docs/content/indexes/terraform/tf-utility-modules.md b/docs/content/indexes/terraform/tf-utility-modules.md
index 7f91ea741..7748e635b 100644
--- a/docs/content/indexes/terraform/tf-utility-modules.md
+++ b/docs/content/indexes/terraform/tf-utility-modules.md
@@ -69,11 +69,10 @@ The following table shows the number of all available, orphaned and proposed **T
### All modules - 📇
-{{< expand "âž• All Modules - Module names, status and owners" "expand/collapse" >}}
-
+
+ âž• All Modules - Module names, status and owners
{{< moduleNameStatusOwners header=true csv="/static/module-indexes/TerraformUtilityModules.csv" language="Terraform" moduleType="utility" >}}
-
-{{< /expand >}}
+