diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
index 8ce8e64b95e3..f142f893cb19 100644
--- a/doc/source/_extra/.htaccess
+++ b/doc/source/_extra/.htaccess
@@ -76,3 +76,4 @@ redirectmatch 301 ^/nova/([^/]+)/upgrade.html$ /nova/$1/user/upgrade.html
 redirectmatch 301 ^/nova/([^/]+)/vendordata.html$ /nova/$1/user/vendordata.html
 redirectmatch 301 ^/nova/([^/]+)/vmstates.html$ /nova/$1/reference/vm-states.html
 redirectmatch 301 ^/nova/([^/]+)/wsgi.html$ /nova/$1/user/wsgi.html
+redirectmatch 301 ^/nova/([^/]+)/user/cellsv2_layout.html$ /nova/$1/user/cellsv2-layout.html
diff --git a/doc/source/index.rst b/doc/source/index.rst
index f2b1fb7cb4b5..20beb2329df4 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -144,7 +144,7 @@ the defaults from the :doc:`install guide </install/index>` will be sufficient.
   * :doc:`Feature Support full list </user/support-matrix>`: A detailed dive through
     features in each compute driver backend.
 
-* :doc:`Cells v2 Planning </user/cellsv2_layout>`: For large deployments, Cells v2
+* :doc:`Cells v2 Planning </user/cellsv2-layout>`: For large deployments, Cells v2
   allows sharding of your compute environment. Upfront planning is key to a
   successful Cells v2 layout.
 * :doc:`Placement service </user/placement>`: Overview of the placement
@@ -275,7 +275,7 @@ looking parts of our architecture. These are collected below.
    user/architecture
    user/block-device-mapping
    user/cells
-   user/cellsv2_layout
+   user/cellsv2-layout
    user/conductor
    user/feature-classification
    user/filter-scheduler
diff --git a/doc/source/user/cellsv2_layout.rst b/doc/source/user/cellsv2-layout.rst
similarity index 100%
rename from doc/source/user/cellsv2_layout.rst
rename to doc/source/user/cellsv2-layout.rst
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index ffc11414d674..cebceb5c596e 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -34,7 +34,7 @@ the defaults from the :doc:`install guide </install/index>` will be sufficient.
   * :doc:`Feature Support full list </user/support-matrix>`: A detailed dive through
     features in each compute driver backend.
 
-* :doc:`Cells v2 Planning </user/cellsv2_layout>`: For large deployments, Cells v2
+* :doc:`Cells v2 Planning </user/cellsv2-layout>`: For large deployments, Cells v2
   allows sharding of your compute environment. Upfront planning is key to a
   successful Cells v2 layout.