diff --git a/doc/source/admin/drivers/ilo.rst b/doc/source/admin/drivers/ilo.rst
index 4ffa8bcfbf..7a2fae8bc4 100644
--- a/doc/source/admin/drivers/ilo.rst
+++ b/doc/source/admin/drivers/ilo.rst
@@ -568,8 +568,8 @@ of boot mode (Legacy BIOS or UEFI).
   Nodes having ``boot_mode`` set to ``uefi`` may be requested by adding an
   ``extra_spec`` to the nova flavor::
 
-    nova flavor-key ironic-test-3 set capabilities:boot_mode="uefi"
-    nova boot --flavor ironic-test-3 --image test-image instance-1
+    openstack flavor set ironic-test-3 --property capabilities:boot_mode="uefi"
+    openstack server create --flavor ironic-test-3 --image test-image instance-1
 
   If ``capabilities`` is used in ``extra_spec`` as above, nova scheduler
   (``ComputeCapabilitiesFilter``) will match only ironic nodes which have
@@ -1013,13 +1013,13 @@ Inspection can also discover the following extra capabilities for iLO driver:
 The operator can specify these capabilities in nova flavor for node to be selected
 for scheduling::
 
-  nova flavor-key my-baremetal-flavor set capabilities:server_model="<in> Gen8"
+  openstack flavor set my-baremetal-flavor --property capabilities:server_model="<in> Gen8"
 
-  nova flavor-key my-baremetal-flavor set capabilities:nic_capacity="10Gb"
+  openstack flavor set my-baremetal-flavor --property capabilities:nic_capacity="10Gb"
 
-  nova flavor-key my-baremetal-flavor set capabilities:ilo_firmware_version="<in> 2.10"
+  openstack flavor set my-baremetal-flavor --property capabilities:ilo_firmware_version="<in> 2.10"
 
-  nova flavor-key my-baremetal-flavor set capabilities:has_ssd="true"
+  openstack flavor set my-baremetal-flavor --property capabilities:has_ssd="true"
 
 See :ref:`capabilities-discovery` for more details and examples.
 
@@ -1850,8 +1850,8 @@ configuration of RAID:
   operator can specify the ``raid_level`` capability in nova flavor for node
   to be selected for scheduling::
 
-    nova flavor-key ironic-test set capabilities:raid_level="1+0"
-    nova boot --flavor ironic-test --image test-image instance-1
+    openstack flavor set ironic-test --property capabilities:raid_level="1+0"
+    openstack server create --flavor ironic-test --image test-image instance-1
 
 .. _DIB_raid_support:
 
diff --git a/doc/source/admin/inspection.rst b/doc/source/admin/inspection.rst
index 1d67c1c6a0..a50ecf898b 100644
--- a/doc/source/admin/inspection.rst
+++ b/doc/source/admin/inspection.rst
@@ -61,9 +61,9 @@ the most complete list is provided by the iLO :ref:`ilo-inspection`.
 The operator can specify these capabilities in nova flavor for node to be selected
 for scheduling::
 
-  nova flavor-key my-baremetal-flavor set capabilities:pci_gpu_devices="> 0"
+  openstack flavor set my-baremetal-flavor --property capabilities:pci_gpu_devices="> 0"
 
-  nova flavor-key my-baremetal-flavor set capabilities:secure_boot="true"
+  openstack flavor set my-baremetal-flavor --property capabilities:secure_boot="true"
 
 Please see a specific :doc:`hardware type page </admin/drivers>` for
 the exact list of capabilities this hardware type can discover.
diff --git a/doc/source/install/configdrive.rst b/doc/source/install/configdrive.rst
index a6223d5071..9c92182d6f 100644
--- a/doc/source/install/configdrive.rst
+++ b/doc/source/install/configdrive.rst
@@ -23,7 +23,7 @@ When used with Compute service
 To enable the configuration drive for a specific request, pass
 ``--config-drive true`` parameter to the :command:`nova boot` command, for example::
 
-    nova boot --config-drive true --flavor baremetal --image test-image instance-1
+    openstack server create --use-config-drive --flavor baremetal --image test-image instance-1
 
 It's also possible to enable the configuration drive automatically on
 all instances by configuring the ``OpenStack Compute service`` to always
diff --git a/doc/source/install/include/boot-mode.inc b/doc/source/install/include/boot-mode.inc
index 1beb7dac08..28d82eac63 100644
--- a/doc/source/install/include/boot-mode.inc
+++ b/doc/source/install/include/boot-mode.inc
@@ -76,8 +76,8 @@ following way:
   Nodes having ``boot_mode`` set to ``uefi`` may be requested by adding an
   ``extra_spec`` to the Compute service flavor::
 
-    nova flavor-key ironic-test-3 set capabilities:boot_mode="uefi"
-    nova boot --flavor ironic-test-3 --image test-image instance-1
+    openstack flavor set ironic-test-3 --property capabilities:boot_mode="uefi"
+    openstack server create boot --flavor ironic-test-3 --image test-image instance-1
 
   If ``capabilities`` is used in ``extra_spec`` as above, nova scheduler
   (``ComputeCapabilitiesFilter``) will match only bare metal nodes which have
diff --git a/doc/source/install/include/disk-label.inc b/doc/source/install/include/disk-label.inc
index 9f6c153258..fb144ba37a 100644
--- a/doc/source/install/include/disk-label.inc
+++ b/doc/source/install/include/disk-label.inc
@@ -51,7 +51,7 @@ which will request such capability, for example::
 
 As for the flavor::
 
-    nova flavor-key baremetal set capabilities:disk_label="gpt"
+    openstack flavor set baremetal --property capabilities:disk_label="gpt"
 
 When used in standalone mode
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/install/include/local-boot-partition-images.inc b/doc/source/install/include/local-boot-partition-images.inc
index ddb13364e5..32ee200ce4 100644
--- a/doc/source/install/include/local-boot-partition-images.inc
+++ b/doc/source/install/include/local-boot-partition-images.inc
@@ -33,7 +33,7 @@ for example::
 Nodes having ``boot_option`` set to ``local`` may be requested by adding
 an ``extra_spec`` to the Compute service flavor, for example::
 
-    nova flavor-key baremetal set capabilities:boot_option="local"
+    openstack flavor set baremetal --property capabilities:boot_option="local"
 
 
 .. note::