diff --git a/guides/common/assembly_provisioning-virtual-machines-vmware.adoc b/guides/common/assembly_provisioning-virtual-machines-vmware.adoc
index b728c9e7600..85f1eea3cb6 100644
--- a/guides/common/assembly_provisioning-virtual-machines-vmware.adoc
+++ b/guides/common/assembly_provisioning-virtual-machines-vmware.adoc
@@ -17,7 +17,9 @@ include::modules/proc_creating-a-vmware-user.adoc[leveloffset=+1]
 
 include::modules/proc_adding-a-vmware-connection-to-server.adoc[leveloffset=+1]
 
-include::modules/proc_adding-vmware-images-to-server.adoc[leveloffset=+1]
+include::modules/proc_adding-vmware-images-to-project-by-using-web-ui.adoc[leveloffset=+1]
+
+include::modules/proc_adding-vmware-images-to-project-by-using-cli.adoc[leveloffset=+1]
 
 include::modules/proc_adding-vmware-details-to-a-compute-profile.adoc[leveloffset=+1]
 
diff --git a/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-cli.adoc b/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-cli.adoc
index 409ed49bb15..896e35f2cb7 100644
--- a/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-cli.adoc
+++ b/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-cli.adoc
@@ -3,8 +3,7 @@
 [id="adding-proxmox-images-to-{project-context}-by-using-cli"]
 = Adding Proxmox images to {Project} by using Hammer CLI
 
-Proxmox uses templates as images for creating virtual machines.
-When you use image-based provisioning to create new hosts, add Proxmox template details to your {Project}.
+Add Proxmox images to {Project} to perform image-based host provisioning on Proxmox.
 
 .Procedure
 . Optional: View all available images on Proxmox:
diff --git a/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-web-ui.adoc b/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-web-ui.adoc
index 95fa809b93f..5d3eb539653 100644
--- a/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-web-ui.adoc
+++ b/guides/common/modules/proc_adding-proxmox-images-to-project-by-using-web-ui.adoc
@@ -3,8 +3,7 @@
 [id="adding-proxmox-images-to-{project-context}-by-using-web-ui"]
 = Adding Proxmox images to {Project} by using {ProjectWebUI}
 
-Proxmox uses templates as images for creating virtual machines.
-When you use image-based provisioning to create hosts, add Proxmox template details to your {Project}.
+Add Proxmox images to {Project} to perform image-based host provisioning on Proxmox.
 
 .Procedure
 . In the {ProjectWebUI}, navigate to *Infrastructure* > *Compute Resources*.
diff --git a/guides/common/modules/proc_adding-vmware-images-to-project-by-using-cli.adoc b/guides/common/modules/proc_adding-vmware-images-to-project-by-using-cli.adoc
new file mode 100644
index 00000000000..7b734f7b169
--- /dev/null
+++ b/guides/common/modules/proc_adding-vmware-images-to-project-by-using-cli.adoc
@@ -0,0 +1,34 @@
+:_mod-docs-content-type: PROCEDURE
+
+[id="adding-vmware-images-to-{project-context}-by-using-cli"]
+= Adding VMware images to {Project} by using CLI
+
+Add VMware images to {Project} to perform image-based host provisioning on VMware.
+
+.Procedure
+. Optional: View all available images on VMware:
++
+[options="nowrap" subs="+quotes"]
+----
+$ hammer compute-resource image available --compute-resource "_My_VMware"
+----
+. Add your Proxmox image to {Project}:
++
+[options="nowrap" subs="+quotes"]
+----
+$ hammer compute-resource image create \
+--architecture "_My_Architecture_" \
+--compute-resource "_My_VMware_" \
+--name "_My_Image_Name_" \
+--operatingsystem "_My_Operating_System_" \
+--username _My_User_Name_ \
+--uuid "_My_UUID_"
+----
+
+.Verification
+* Verify that the VMware image is present on your {Project}:
++
+[options="nowrap" subs="+quotes"]
+----
+$ hammer compute-resource image list --compute-resource "_My_VMware_"
+----
diff --git a/guides/common/modules/proc_adding-vmware-images-to-project-by-using-web-ui.adoc b/guides/common/modules/proc_adding-vmware-images-to-project-by-using-web-ui.adoc
new file mode 100644
index 00000000000..d3b31b73d49
--- /dev/null
+++ b/guides/common/modules/proc_adding-vmware-images-to-project-by-using-web-ui.adoc
@@ -0,0 +1,20 @@
+:_mod-docs-content-type: PROCEDURE
+
+[id="adding-vmware-images-to-{project-context}-by-using-web-ui"]
+= Adding VMware images to {Project} by using {ProjectWebUI}
+
+Add VMware images to {Project} to perform image-based host provisioning on VMware.
+
+.Procedure
+. In the {ProjectWebUI}, navigate to *Infrastructure* > *Compute Resources*.
+. Select your VMware compute resource.
+. Click *Create Image*.
+. In the *Name* field, enter a name for the image.
+. From the *Operating System* list, select the base operating system of the image.
+. From the *Architecture* list, select the operating system architecture.
+. In the *Username* field, enter the SSH user name for image access.
+By default, this is set to `root`.
+. If your image supports user data input such as `cloud-init` data, click the *User data* checkbox.
+. Optional: In the *Password* field, enter the SSH password to access the image.
+. From the *Image* list, select an image from VMware.
+. Click *Submit* to save the image details.
diff --git a/guides/common/modules/proc_adding-vmware-images-to-server.adoc b/guides/common/modules/proc_adding-vmware-images-to-server.adoc
deleted file mode 100644
index b13ffb6f9cb..00000000000
--- a/guides/common/modules/proc_adding-vmware-images-to-server.adoc
+++ /dev/null
@@ -1,40 +0,0 @@
-:_mod-docs-content-type: PROCEDURE
-
-[id="Adding_VMware_Images_to_Server_{context}"]
-= Adding VMware images to {ProjectServer}
-
-VMware vSphere uses templates as images for creating new virtual machines.
-If using image-based provisioning to create new hosts, you need to add VMware template details to your {ProjectServer}.
-This includes access details and the template name.
-
-To use the CLI instead of the {ProjectWebUI}, see the xref:cli-adding-vmware-vsphere-images-to-server_{context}[].
-
-.Procedure
-. In the {ProjectWebUI}, navigate to *Infrastructure* > *Compute Resources*.
-. Select your VMware compute resource.
-. Click *Create Image*.
-. In the *Name* field, enter a name for the image.
-. From the *Operating System* list, select the base operating system of the image.
-. From the *Architecture* list, select the operating system architecture.
-. In the *Username* field, enter the SSH user name for image access.
-By default, this is set to `root`.
-. If your image supports user data input such as `cloud-init` data, click the *User data* checkbox.
-. Optional: In the *Password* field, enter the SSH password to access the image.
-. From the *Image* list, select an image from VMware.
-. Click *Submit* to save the image details.
-
-[id="cli-adding-vmware-vsphere-images-to-server_{context}"]
-.CLI procedure
-* Create the image with the `hammer compute-resource image create` command.
-Use the `--uuid` field to store the relative template path on the vSphere environment:
-+
-[options="nowrap" subs="+quotes"]
-----
-$ hammer compute-resource image create \
---architecture "_My_Architecture_" \
---compute-resource "_My_VMware_"
---name "_My_Image_" \
---operatingsystem "_My_Operating_System_" \
---username root \
---uuid "_My_UUID_"
-----
diff --git a/guides/common/modules/proc_using-vmware-cloud-init-and-userdata-templates-for-provisioning.adoc b/guides/common/modules/proc_using-vmware-cloud-init-and-userdata-templates-for-provisioning.adoc
index 5d299d05309..e1724053f3e 100644
--- a/guides/common/modules/proc_using-vmware-cloud-init-and-userdata-templates-for-provisioning.adoc
+++ b/guides/common/modules/proc_using-vmware-cloud-init-and-userdata-templates-for-provisioning.adoc
@@ -210,4 +210,4 @@ endif::[]
 # unset HISTFILE
 ----
 . Create an image from this virtual machine.
-. xref:Adding_VMware_Images_to_Server_{context}[Add your image to {Project}].
+. xref:adding-vmware-images-to-{project-context}-by-using-web-ui[Add your image to {Project}].