diff --git a/src/automation/azext_automation/tests/latest/test_automation_scenario_manual.py b/src/automation/azext_automation/tests/latest/test_automation_scenario_manual.py
index f9b7bef6bdd..5f0e8d41b0e 100644
--- a/src/automation/azext_automation/tests/latest/test_automation_scenario_manual.py
+++ b/src/automation/azext_automation/tests/latest/test_automation_scenario_manual.py
@@ -219,7 +219,7 @@ def test_automation_software_update_configuration(self, resource_group):
         })
 
         sub = '/subscriptions/' + self.get_subscription_id()
-        vm_id = self.cmd('vm create -n {vm_name} -g {rg} --image ubuntults --generate-ssh-key --nsg-rule NONE --location "West US 2"').get_output_in_json()['id']
+        vm_id = self.cmd('vm create -n {vm_name} -g {rg} --image Canonical:UbuntuServer:18.04-LTS:latest --generate-ssh-key --nsg-rule NONE --location "West US 2"').get_output_in_json()['id']
         self.kwargs.update({
             'vm_id': vm_id,
             'sub': sub,
diff --git a/src/bastion/azext_bastion/tests/latest/test_bastion.py b/src/bastion/azext_bastion/tests/latest/test_bastion.py
index e64445679a5..13231c5cfb0 100644
--- a/src/bastion/azext_bastion/tests/latest/test_bastion.py
+++ b/src/bastion/azext_bastion/tests/latest/test_bastion.py
@@ -25,7 +25,7 @@ def test_bastion_host_crud(self):
         self.cmd("network vnet create -n {vnet_name} -g {rg} --subnet-name AzureBastionSubnet")
         self.cmd("network vnet subnet create -n {subnet_name} -g {rg} --vnet-name {vnet_name} --address-prefixes 10.0.2.0/24")
         self.cmd("network public-ip create -n {ip_name} -g {rg} --sku Standard")
-        self.cmd("vm create -n {vm_name} -g {rg} --vnet-name {vnet_name} --subnet {subnet_name} --nsg-rule None --image UbuntuLTS --authentication-type password --admin-username testadmin --admin-password TestPassword11!!")
+        self.cmd("vm create -n {vm_name} -g {rg} --vnet-name {vnet_name} --subnet {subnet_name} --nsg-rule None --image Canonical:UbuntuServer:18.04-LTS:latest --authentication-type password --admin-username testadmin --admin-password TestPassword11!!")
 
         self.cmd(
             "network bastion create -n {bastion_name} -g {rg} --public-ip-address {ip_name} --vnet-name {vnet_name} "
diff --git a/src/image-copy/azext_imagecopy/tests/latest/test_image_copy_commands.py b/src/image-copy/azext_imagecopy/tests/latest/test_image_copy_commands.py
index dee92cc9dca..120acdaa3d6 100644
--- a/src/image-copy/azext_imagecopy/tests/latest/test_image_copy_commands.py
+++ b/src/image-copy/azext_imagecopy/tests/latest/test_image_copy_commands.py
@@ -51,7 +51,7 @@ def test_image_copy_locations(self, resource_group):
             'loc2': 'australiaeast',
         })
 
-        self.cmd('vm create -g {rg} -n {vm} --admin-username theuser --image centos --admin-password testPassword0 '
+        self.cmd('vm create -g {rg} -n {vm} --admin-username theuser --image OpenLogic:CentOS:7.5:latest --admin-password testPassword0 '
                  '--authentication-type password --nsg-rule NONE')
         time.sleep(70)
         self.cmd('vm deallocate -g {rg} -n {vm}')
diff --git a/src/logz/azext_logz/tests/latest/test_logz_commands.py b/src/logz/azext_logz/tests/latest/test_logz_commands.py
index a8944a66c66..09692bf69a2 100644
--- a/src/logz/azext_logz/tests/latest/test_logz_commands.py
+++ b/src/logz/azext_logz/tests/latest/test_logz_commands.py
@@ -111,7 +111,7 @@ def test_main_account_vm(self):
         # create virtual machine
         self.cmd(
             "vm create -n {vm} -g {rg} \
-            --os-disk-name os-disk --image centos \
+            --os-disk-name os-disk --image OpenLogic:CentOS:7.5:latest \
             --generate-ssh-keys --public-ip-sku standard",
             checks=[
                 self.check("powerState", "VM running")
@@ -274,7 +274,7 @@ def test_sub_account_vm(self):
         # create virtual machine
         self.cmd(
             "vm create -n {vm} -g {rg} \
-            --os-disk-name os-disk --image centos \
+            --os-disk-name os-disk --image OpenLogic:CentOS:7.5:latest \
             --generate-ssh-keys --public-ip-sku standard",
             checks=[
                 self.check("powerState", "VM running")
diff --git a/src/vm-repair/azext_vm_repair/tests/latest/test_repair_commands.py b/src/vm-repair/azext_vm_repair/tests/latest/test_repair_commands.py
index 5e9723720ba..f883f0dfdf3 100644
--- a/src/vm-repair/azext_vm_repair/tests/latest/test_repair_commands.py
+++ b/src/vm-repair/azext_vm_repair/tests/latest/test_repair_commands.py
@@ -89,7 +89,7 @@ def test_vmrepair_LinuxManagedCreateRestore(self, resource_group):
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -124,7 +124,7 @@ def test_vmrepair_LinuxUnmanagedCreateRestore(self, resource_group):
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018 --use-unmanaged-disk')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018 --use-unmanaged-disk')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -226,7 +226,7 @@ def test_vmrepair_LinuxManagedCreateRestorePublicIp(self, resource_group):
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -260,7 +260,7 @@ def test_vmrepair_LinuxUnmanagedCreateRestorePublicIp(self, resource_group):
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018 --use-unmanaged-disk')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018 --use-unmanaged-disk')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -351,7 +351,7 @@ def test_vmrepair_LinuxSinglepassKekEncryptedManagedDiskCreateRestore(self, reso
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -450,7 +450,7 @@ def test_vmrepair_LinuxSinglepassNoKekEncryptedManagedDiskCreateRestoreTest(self
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -517,7 +517,7 @@ def test_vmrepair_LinuxRunHelloWorld(self, resource_group):
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --admin-username azureadmin --image UbuntuLTS --admin-password !Passw0rd2018')
+        self.cmd('vm create -g {rg} -n {vm} --admin-username azureadmin --image Canonical:UbuntuServer:18.04-LTS:latest --admin-password !Passw0rd2018')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -573,7 +573,7 @@ def test_vmrepair_LinuxSinglepassKekEncryptedManagedDiskCreateRestoreRHEL8(self,
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -626,7 +626,7 @@ def test_vmrepair_LinuxSinglepassNoKekEncryptedManagedDiskCreateRestoreTestSLES1
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018 --size Standard_D2s_v3')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1
@@ -671,7 +671,7 @@ def test_vmrepair_LinuxManagedCreateRestoreOracle8PublicIp(self, resource_group)
         })
 
         # Create test VM
-        self.cmd('vm create -g {rg} -n {vm} --image UbuntuLTS --admin-username azureadmin --admin-password !Passw0rd2018')
+        self.cmd('vm create -g {rg} -n {vm} --image Canonical:UbuntuServer:18.04-LTS:latest --admin-username azureadmin --admin-password !Passw0rd2018')
         vms = self.cmd('vm list -g {rg} -o json').get_output_in_json()
         # Something wrong with vm create command if it fails here
         assert len(vms) == 1