diff --git a/doc/source/admin/ha.rst b/doc/source/admin/ha.rst
index 6dfb5e67..3e85c592 100644
--- a/doc/source/admin/ha.rst
+++ b/doc/source/admin/ha.rst
@@ -59,8 +59,8 @@ is done through the use of a placement directive (the ``--to`` option available
 to the :command:`juju deploy` or :command:`juju add-unit` commands) or the
 'zones' machine constraint (e.g. ``--constraints zones=zone2``). This can be
 done at deploy or scale out time and is particularly useful for hyperconverged
-cloud nodes. See `Deploying to specific machines`_ and `Bundle reference`_ in
-the Juju documentation.
+cloud nodes. See `How to deploy to a specific machine`_ and `Bundle reference`_
+in the Juju documentation.
 
 .. note::
 
@@ -850,7 +850,7 @@ Charms`_ project group.
 .. _mysql-innodb-cluster: https://opendev.org/openstack/charm-mysql-innodb-cluster/src/branch/master/src/README.md
 .. _percona-cluster: https://opendev.org/openstack/charm-percona-cluster/src/branch/master/README.md
 .. _rabbitmq-server: https://opendev.org/openstack/charm-rabbitmq-server/src/branch/master/README.md
-.. _Deploying to specific machines: https://juju.is/docs/olm/advanced-application-deployment#heading--deploying-to-specific-machines
+.. _How to deploy to a specific machine: https://juju.is/docs/olm/deploy-to-a-specific-machine
 .. _Bundle reference: https://jaas.ai/docs/bundle-reference
 .. _Nova availability zone: https://docs.openstack.org/nova/latest/admin/availability-zones.html
 .. _Neutron availability zone: https://docs.openstack.org/neutron/latest/admin/config-az.html
diff --git a/doc/source/community/software-contrib/charm-readme-template.rst b/doc/source/community/software-contrib/charm-readme-template.rst
index 382213a2..81fb1bc5 100644
--- a/doc/source/community/software-contrib/charm-readme-template.rst
+++ b/doc/source/community/software-contrib/charm-readme-template.rst
@@ -27,10 +27,10 @@ documentation.
 
 When referencing another charm in a general way, link to the charm's
 `Charmhub`_ entry for the most recent stable channel (e.g.
-https://charmhub.io/keystone?channel=xena/stable). When referring specifically
+https://charmhub.io/keystone?channel=yoga/stable). When referring specifically
 to information in another charm's README, link directly to the file, or to a
 header in the file, by way of the charm's repository on `opendev.org`_ (e.g.
-https://opendev.org/openstack/charm-keystone/src/branch/stable/xena/README.md).
+https://opendev.org/openstack/charm-keystone/src/branch/stable/yoga/README.md).
 
 Structure
 ---------