diff --git a/docs/environments/index.rst b/docs/environments/index.rst
index a244827..18948ea 100644
--- a/docs/environments/index.rst
+++ b/docs/environments/index.rst
@@ -1,16 +1,14 @@
-Processing Environments
-=======================
+Environments
+============
 
 .. toctree::
     :maxdepth: 1
     :caption: Contents:
 
-    ffa/libsp
-    deployment-guides/fvp-deployment-guide.rst
-    deployment-guides/opteesp-deployment-guide.rst
+    secure-partitions/index
 
 --------------
 
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
 
 SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/environments/deployment-guides/fvp-deployment-guide.rst b/docs/environments/secure-partitions/fvp-deployment-guide.rst
similarity index 100%
rename from docs/environments/deployment-guides/fvp-deployment-guide.rst
rename to docs/environments/secure-partitions/fvp-deployment-guide.rst
diff --git a/docs/environments/secure-partitions/index.rst b/docs/environments/secure-partitions/index.rst
new file mode 100644
index 0000000..6534717
--- /dev/null
+++ b/docs/environments/secure-partitions/index.rst
@@ -0,0 +1,16 @@
+Secure Partitions
+=================
+
+.. toctree::
+    :maxdepth: 1
+    :caption: Contents:
+
+    libsp
+    fvp-deployment-guide.rst
+    opteesp-deployment-guide.rst
+
+--------------
+
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
+
+SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/environments/ffa/libsp.rst b/docs/environments/secure-partitions/libsp.rst
similarity index 100%
rename from docs/environments/ffa/libsp.rst
rename to docs/environments/secure-partitions/libsp.rst
diff --git a/docs/environments/deployment-guides/opteesp-deployment-guide.rst b/docs/environments/secure-partitions/opteesp-deployment-guide.rst
similarity index 100%
rename from docs/environments/deployment-guides/opteesp-deployment-guide.rst
rename to docs/environments/secure-partitions/opteesp-deployment-guide.rst