diff --git a/modules/matrices/matrices_config.py b/modules/matrices/matrices_config.py
index 8aadd48672e..be228ef91bd 100644
--- a/modules/matrices/matrices_config.py
+++ b/modules/matrices/matrices_config.py
@@ -53,8 +53,9 @@
             "Identity Provider",
             "SaaS",
             "IaaS",
-            "Network",
+            "Network Devices",
             "Containers",
+            "ESXi",
         ],
         "descr": "Below are the tactics and techniques representing the MITRE ATT&CK<sup>&reg;</sup> Matrix for Enterprise.",
         "subtypes": [
@@ -141,12 +142,12 @@
                 ],
             },
             {
-                "name": "Network",
+                "name": "Network Devices",
                 "type": "local",
                 "matrix": "enterprise-attack",
-                "path": "enterprise/network",
-                "platforms": ["Network"],
-                "descr": "Below are the tactics and techniques representing the MITRE ATT&CK<sup>&reg;</sup> Network platform. The techniques below are known to target network devices such as routers, switches, and load balancers.",
+                "path": "enterprise/network-devices",
+                "platforms": ["Network Devices"],
+                "descr": "Below are the tactics and techniques representing the MITRE ATT&CK<sup>&reg;</sup> Network Devices platform. The techniques below are known to target network devices such as routers, switches, and load balancers.",
                 "subtypes": [],
             },
             {
@@ -158,6 +159,15 @@
                 "descr": "Below are the tactics and techniques representing the MITRE ATT&CK<sup>&reg;</sup> Containers platform. The techniques below are known to target containers and container orchestration systems such as Kubernetes.",
                 "subtypes": [],
             },
+            {
+                "name": "ESXi",
+                "type": "local",
+                "matrix": "enterprise-attack",
+                "path": "enterprise/esxi",
+                "platforms": ["ESXi"],
+                "descr": "Below are the tactics and techniques representing the MITRE ATT&CK<sup>&reg;</sup> ESXi platform. The techniques below are known to target VMware ESXi hypervisors. The Matrix contains information for the ESXi platform.",
+                "subtypes": [],
+            },
         ],
     },
     {
@@ -216,8 +226,9 @@
     "Identity Provider": "enterprise/cloud/identityprovider",
     "SaaS": "enterprise/cloud/saas",
     "IaaS": "enterprise/cloud/iaas",
-    "Network": "enterprise/network",
+    "Network Devices": "enterprise/network-devices",
     "Containers": "enterprise/containers",
+    "ESXi": "enterprise/esxi",
     "Android": "mobile/android",
     "iOS": "mobile/ios",
 }
diff --git a/modules/redirections/redirections.json b/modules/redirections/redirections.json
index 15ef4581003..9980c767966 100644
--- a/modules/redirections/redirections.json
+++ b/modules/redirections/redirections.json
@@ -264,6 +264,11 @@
         "from": "matrices/enterprise/cloud/azure",
         "to": "/matrices/enterprise/cloud/iaas"
     },
+    {
+        "title": "network-devices-matrix",
+        "from": "matrices/enterprise/network",
+        "to": "/matrices/enterprise/network-devices"
+    },
     {
         "title" : "Getting Started Redirect",
         "from" : "resources/getting-started",
diff --git a/modules/website_build/website_build_config.py b/modules/website_build/website_build_config.py
index ec8891cc5d6..46c9f50636e 100644
--- a/modules/website_build/website_build_config.py
+++ b/modules/website_build/website_build_config.py
@@ -50,8 +50,9 @@
         "Identity Providers",
         "SaaS",
         "IaaS",
-        "Network",
+        "Network Devices",
         "Containers",
+        "ESXi",
     ],
 }