diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1
index 6d328171b..bc0e649fb 100644
--- a/helpers/GenerateResourcesAndImage.ps1
+++ b/helpers/GenerateResourcesAndImage.ps1
@@ -62,7 +62,7 @@ Function GenerateResourcesAndImage {
Delete the resource group if it exists without user confirmation.
.EXAMPLE
- GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\azure-pipelines-image-generation" -ImageType Ubuntu1604 -AzureLocation "East US"
+ GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1604 -AzureLocation "East US"
#>
param (
[Parameter(Mandatory = $True)]
diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md
index ae108c85b..d8bdd79c2 100644
--- a/images/linux/Ubuntu1604-README.md
+++ b/images/linux/Ubuntu1604-README.md
@@ -1,5 +1,5 @@
-# Hosted Ubuntu 1604 Image (Ubuntu 16.04.6 LTS)
-The following software is installed on machines in the Hosted Ubuntu 1604 (20191202.1) pool
+# Ubuntu 16.04.6 LTS
+The following software is installed on machines with the 20191202.1 update.
***
- 7-Zip 9.20
- Ansible (ansible 2.9.1)
diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md
index fb3065162..783c5a59d 100644
--- a/images/linux/Ubuntu1804-README.md
+++ b/images/linux/Ubuntu1804-README.md
@@ -1,5 +1,5 @@
-# Hosted Ubuntu 1804 Image (Ubuntu 18.04.3 LTS)
-The following software is installed on machines in the Hosted Ubuntu 1804 (v20191202.1) pool
+# Ubuntu 18.04.3 LTS
+The following software is installed on machines with the 20191202.1 update.
***
- 7-Zip 16.02
- Ansible (ansible 2.9.1)
diff --git a/images/linux/config/ubuntu1604.conf b/images/linux/config/ubuntu1604.conf
index e9fbaed22..d2ac14231 100644
--- a/images/linux/config/ubuntu1604.conf
+++ b/images/linux/config/ubuntu1604.conf
@@ -1,2 +1,2 @@
-# Name of the hosted pool this image will support
-POOL_NAME="Hosted Ubuntu 1604"
+# Name of the pool supported by this image
+POOL_NAME="Ubuntu 1604"
diff --git a/images/linux/config/ubuntu1804.conf b/images/linux/config/ubuntu1804.conf
index 375a9382b..bca2da8a0 100644
--- a/images/linux/config/ubuntu1804.conf
+++ b/images/linux/config/ubuntu1804.conf
@@ -1,2 +1,2 @@
-# Name of the hosted pool this image will support
-POOL_NAME="Hosted Ubuntu 1804"
+# Name of pool supported by this image
+POOL_NAME="Ubuntu 1804"
diff --git a/images/linux/scripts/installers/1604/preparemetadata.sh b/images/linux/scripts/installers/1604/preparemetadata.sh
index 5b4c177e9..45cfcabfa 100644
--- a/images/linux/scripts/installers/1604/preparemetadata.sh
+++ b/images/linux/scripts/installers/1604/preparemetadata.sh
@@ -7,6 +7,6 @@
source $HELPER_SCRIPTS/document.sh
-AddTitle "Hosted Ubuntu 1604 Image ($(lsb_release -ds))"
-WriteItem "The following software is installed on machines in the Hosted Ubuntu 1604 ($IMAGE_VERSION) pool"
+AddTitle "$(lsb_release -ds)"
+WriteItem "The following software is installed on machines with the $IMAGE_VERSION update."
WriteItem "***"
diff --git a/images/linux/scripts/installers/1804/preparemetadata.sh b/images/linux/scripts/installers/1804/preparemetadata.sh
index 61988142c..45cfcabfa 100644
--- a/images/linux/scripts/installers/1804/preparemetadata.sh
+++ b/images/linux/scripts/installers/1804/preparemetadata.sh
@@ -7,6 +7,6 @@
source $HELPER_SCRIPTS/document.sh
-AddTitle "Hosted Ubuntu 1804 Image ($(lsb_release -ds))"
-WriteItem "The following software is installed on machines in the Hosted Ubuntu 1804 (v$IMAGE_VERSION) pool"
+AddTitle "$(lsb_release -ds)"
+WriteItem "The following software is installed on machines with the $IMAGE_VERSION update."
WriteItem "***"
diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md
index c550b5238..1e6a51df1 100644
--- a/images/win/Windows2016-Readme.md
+++ b/images/win/Windows2016-Readme.md
@@ -1,6 +1,6 @@
-# Hosted Windows2016 image
+# Windows Server 2016
-The following software is installed on machines in the Azure Pipelines **Hosted Windows2016** (v20191009.1) pool.
+The following software is installed on machines with the 20191009.1 update.
Components marked with **\*** have been upgraded since the previous version of the image.
@@ -519,8 +519,6 @@ _Environment:_
* Bower 1.8.8
* Yarn 1.19.1
-> Note: You can install and use another version of Node.js on Microsoft-hosted agent pools using the [Node tool installer](https://docs.microsoft.com/vsts/pipelines/tasks/tool/node-js) task.
-
## npm
_Version:_ 6.9.0
diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md
index aa6f5a417..3808b2bcc 100644
--- a/images/win/Windows2019-Readme.md
+++ b/images/win/Windows2019-Readme.md
@@ -1,6 +1,6 @@
-# Hosted Windows 2019
+# Windows Server 2019
-The following software is installed on machines in the **Hosted Windows 2019** (v20191009.1) pool.
+The following software is installed on machines with the 20191009.1 update.
Components marked with **\*** have been upgraded since the previous version of the image.
@@ -486,8 +486,6 @@ _Environment:_
* Bower 1.8.8
* Yarn 1.19.1
-> Note: You can install and use another version of Node.js on Microsoft-hosted agent pools using the [Node tool installer](https://docs.microsoft.com/vsts/pipelines/tasks/tool/node-js) task.
-
## npm
_Version:_ 6.9.0
diff --git a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
index 335719005..e22d9da8d 100644
--- a/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2016/Initialize-VM.ps1
@@ -119,9 +119,9 @@ wmic logicaldisk get size,freespace,caption
# Adding description of the software to Markdown
$Content = @"
-# Azure Pipelines Hosted VS2017 image
+# Windows Server 2016
-The following software is installed on machines in the Azure Pipelines **Hosted VS2017** (v$env:ImageVersion) pool.
+The following software is installed on machines with the $env:ImageVersion update.
Components marked with **\*** have been upgraded since the previous version of the image.
diff --git a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1 b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
index 83087f706..09567e71a 100644
--- a/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
+++ b/images/win/scripts/Installers/Windows2019/Initialize-VM.ps1
@@ -118,9 +118,9 @@ wmic logicaldisk get size,freespace,caption
# Adding description of the software to Markdown
$Content = @"
-# Azure Pipelines Hosted Windows 2019 with VS2019 image
+# Windows Server 2019
-The following software is installed on machines in the Azure Pipelines **Hosted Windows 2019 with VS2019** (v$env:ImageVersion) pool.
+The following software is installed on machines with the $env:ImageVersion update.
Components marked with **\*** have been upgraded since the previous version of the image.