diff --git a/images/linux/scripts/installers/1604/azpowershell.sh b/images/linux/scripts/installers/1604/azpowershell.sh
index c8211f68..73d22945 100644
--- a/images/linux/scripts/installers/1604/azpowershell.sh
+++ b/images/linux/scripts/installers/1604/azpowershell.sh
@@ -13,6 +13,7 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -Requi
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force'
+sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.1.0 -RequiredVersion 3.1.0 -Force'
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -40,6 +41,11 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath
     if (!(get-module -listavailable -name Az.accounts)) {
         Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
     }
+    $env:PSModulePath = $actualPSModulePath
+    $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.1.0:" + $env:PSModulePath;
+    if (!(get-module -listavailable -name Az.accounts)) {
+        Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
+    }
     $env:PSModulePath = $actualPSModulePath'; then
     exit 1
 fi
@@ -50,4 +56,5 @@ DocumentInstalledItem "Az Module (1.0.0)"
 DocumentInstalledItem "Az Module (1.6.0)"
 DocumentInstalledItem "Az Module (2.3.2)"
 DocumentInstalledItem "Az Module (2.6.0)"
-DocumentInstalledItem "Az Module (2.8.0)"
\ No newline at end of file
+DocumentInstalledItem "Az Module (2.8.0)"
+DocumentInstalledItem "Az Module (3.1.0)"
\ No newline at end of file
diff --git a/images/linux/scripts/installers/1804/azpowershell.sh b/images/linux/scripts/installers/1804/azpowershell.sh
index ca41c380..73d22945 100644
--- a/images/linux/scripts/installers/1804/azpowershell.sh
+++ b/images/linux/scripts/installers/1804/azpowershell.sh
@@ -13,6 +13,7 @@ sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_1.6.0 -Requi
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.3.2 -RequiredVersion 2.3.2 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.6.0 -RequiredVersion 2.6.0 -Force'
 sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_2.8.0 -RequiredVersion 2.8.0 -Force'
+sudo pwsh -Command 'Save-Module -Name Az -LiteralPath /usr/share/az_3.1.0 -RequiredVersion 3.1.0 -Force'
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -40,6 +41,11 @@ if ! pwsh -Command '$actualPSModulePath = $env:PSModulePath ; $env:PSModulePath
     if (!(get-module -listavailable -name Az.accounts)) {
         Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
     }
+    $env:PSModulePath = $actualPSModulePath
+    $actualPSModulePath = $env:PSModulePath ; $env:PSModulePath = "/usr/share/az_3.1.0:" + $env:PSModulePath;
+    if (!(get-module -listavailable -name Az.accounts)) {
+        Write-Host "Az Module was not installed"; $env:PSModulePath = $actualPSModulePath; exit 1
+    }
     $env:PSModulePath = $actualPSModulePath'; then
     exit 1
 fi
@@ -51,3 +57,4 @@ DocumentInstalledItem "Az Module (1.6.0)"
 DocumentInstalledItem "Az Module (2.3.2)"
 DocumentInstalledItem "Az Module (2.6.0)"
 DocumentInstalledItem "Az Module (2.8.0)"
+DocumentInstalledItem "Az Module (3.1.0)"
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1
index c1f7956a..24f175a7 100644
--- a/images/win/scripts/Installers/Install-AzureModules.ps1
+++ b/images/win/scripts/Installers/Install-AzureModules.ps1
@@ -162,7 +162,7 @@ $extractLocation = "C:\Modules"
 $azurePsUri = @(
     "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzurePSModules.M157.20190808.27979.zip",
     "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzureRmPSModules.M157.20190808.27379.zip",
-    "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzPSModules.M158.20190903.19326.zip"
+    "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/AzPSModules.M163.20191211.17769.zip"
 )
 
 $azureRMModulePath = "C:\Modules\azurerm_2.1.0"