diff --git a/doc/source/user/howto.rst b/doc/source/user/howto.rst
index 0f66d2a71..df325c2a6 100644
--- a/doc/source/user/howto.rst
+++ b/doc/source/user/howto.rst
@@ -2,10 +2,10 @@
 How-To
 ======
 
-Use the OpenStack CLI
+Use the baremetal CLI
 =====================
 
-If you wish to utilize the OpenStack CLI in no-auth mode, there are two options
+If you wish to utilize the baremetal CLI in no-auth mode, there are two options
 for configuring the authentication parameters.
 
 clouds.yaml
@@ -43,6 +43,13 @@ example::
 This should display a table of nodes, or nothing if there are no nodes
 registered in Ironic.
 
+Installing OpenStack CLI
+------------------------
+
+Starting with the Victoria release, the ``openstack`` command is only installed
+when Keystone is enabled. Install the ``python-openstackclient`` Python package
+to get this command.
+
 Enroll Hardware
 ===============
 
@@ -250,9 +257,7 @@ By default, Bifrost deploys a configuration drive which includes the user SSH
 public key, hostname, and the network configuration in the form of
 network_data.json that can be read/parsed by the
 `glean <https://opendev.org/opendev/glean>`_ utility. This allows for
-the deployment of Ubuntu, CentOS, or Fedora "tenants" on baremetal.  This file
-format is not yet supported by Cloud-Init, however it is on track for
-inclusion in cloud-init 2.0.
+the deployment of Ubuntu, CentOS, or Fedora "tenants" on baremetal.
 
 By default, Bifrost utilizes a utility called simple-init which leverages
 the previously noted glean utility to apply network configuration.  This
diff --git a/doc/source/user/keystone.rst b/doc/source/user/keystone.rst
index e6a84a966..4a530c4fa 100644
--- a/doc/source/user/keystone.rst
+++ b/doc/source/user/keystone.rst
@@ -1,10 +1,5 @@
 .. _keystone:
 
-.. NOTE:: Use of keystone with bifrost is a very new feature and should
-   be considered an advanced topic. Please feel free to reach out to the
-   bifrost contributors and the ironic community as a whole in the project's
-   `IRC`_ channel.
-
 .. _`IRC`: https://wiki.openstack.org/wiki/Ironic#IRC
 
 Bifrost execution with Keystone
diff --git a/doc/source/user/troubleshooting.rst b/doc/source/user/troubleshooting.rst
index 7f1eaf0b8..0a542a9f5 100644
--- a/doc/source/user/troubleshooting.rst
+++ b/doc/source/user/troubleshooting.rst
@@ -13,7 +13,7 @@ are being booted can connect to the following ports::
 
     67/UDP for DHCP requests to be serviced
     69/UDP for TFTP file transfers (Initial iPXE binary)
-    6301/TCP for the ironic API
+    6385/TCP for the ironic API
     8080/TCP for HTTP File Downloads (iPXE, Ironic-Python-Agent)
 
 If you encounter any additional issues, use of ``tcpdump`` is highly