diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
index f92f1c7b..8ddaf74b 100644
--- a/doc/source/_extra/.htaccess
+++ b/doc/source/_extra/.htaccess
@@ -1,9 +1,10 @@
 # This file contains redirects to handle existing URLs for specs
 # that have been moved
-Redirect 301 /openstack/cinder-specs/specs/train/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html
-Redirect 301 /openstack/cinder-specs/specs/ussuri/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html
-Redirect 301 /openstack/cinder-specs/specs/victoria/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html
-Redirect 301 /openstack/cinder-specs/specs/wallaby/image-encryption.html /openstack/cinder-specs/specs/xena/image-encryption.html
+Redirect 301 /openstack/cinder-specs/specs/train/image-encryption.html /openstack/cinder-specs/specs/yoga/image-encryption.html
+Redirect 301 /openstack/cinder-specs/specs/ussuri/image-encryption.html /openstack/cinder-specs/specs/yoga/image-encryption.html
+Redirect 301 /openstack/cinder-specs/specs/victoria/image-encryption.html /openstack/cinder-specs/specs/yoga/image-encryption.html
+Redirect 301 /openstack/cinder-specs/specs/wallaby/image-encryption.html /openstack/cinder-specs/specs/yoga/image-encryption.html
+Redirect 301 /openstack/cinder-specs/specs/xena/image-encryption.html /openstack/cinder-specs/specs/yoga/image-encryption.html
 Redirect 301 /openstack/cinder-specs/specs/train/support-glance-multiple-backend.html /openstack/cinder-specs/specs/ussuri/support-glance-multiple-backend.html
 Redirect 301 /openstack/cinder-specs/specs/train/query-cinder-resources-filter-by-time-comparison-operators.html /openstack/cinder-specs/specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.html
 Redirect 301 /openstack/cinder-specs/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.html /openstack/cinder-specs/specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.html
diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt
index c3fca250..1a807a33 100644
--- a/doc/test/redirect-tests.txt
+++ b/doc/test/redirect-tests.txt
@@ -1,10 +1,11 @@
 # This file contains tests for redirects to handle existing URLs for
 # specs that have been moved. See
 # https://docs.openstack.org/whereto/latest/ for details.
-/openstack/cinder-specs/specs/train/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html
-/openstack/cinder-specs/specs/ussuri/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html
-/openstack/cinder-specs/specs/victoria/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html
-/openstack/cinder-specs/specs/wallaby/image-encryption.html 301 /openstack/cinder-specs/specs/xena/image-encryption.html
+/openstack/cinder-specs/specs/train/image-encryption.html 301 /openstack/cinder-specs/specs/yoga/image-encryption.html
+/openstack/cinder-specs/specs/ussuri/image-encryption.html 301 /openstack/cinder-specs/specs/yoga/image-encryption.html
+/openstack/cinder-specs/specs/victoria/image-encryption.html 301 /openstack/cinder-specs/specs/yoga/image-encryption.html
+/openstack/cinder-specs/specs/wallaby/image-encryption.html 301 /openstack/cinder-specs/specs/yoga/image-encryption.html
+/openstack/cinder-specs/specs/xena/image-encryption.html 301 /openstack/cinder-specs/specs/yoga/image-encryption.html
 /openstack/cinder-specs/specs/train/support-glance-multiple-backend.html 301 /openstack/cinder-specs/specs/ussuri/support-glance-multiple-backend.html
 /openstack/cinder-specs/specs/train/query-cinder-resources-filter-by-time-comparison-operators.html 301 /openstack/cinder-specs/specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.html
 /openstack/cinder-specs/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.html 301 /openstack/cinder-specs/specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.html
diff --git a/specs/xena/image-encryption.rst b/specs/yoga/image-encryption.rst
similarity index 100%
rename from specs/xena/image-encryption.rst
rename to specs/yoga/image-encryption.rst
diff --git a/specs/yoga/remove-me.rst b/specs/yoga/remove-me.rst
deleted file mode 100644
index ae861e3b..00000000
--- a/specs/yoga/remove-me.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. This file is a place holder.  It should be removed by
-   any patch proposing a spec for the Wallaby release
-
-================================
-No specs have yet been approved.
-================================