diff --git a/CanaryValidator/Canary.Tests.ps1 b/CanaryValidator/Canary.Tests.ps1
index 0d2b1585..45ee377f 100644
--- a/CanaryValidator/Canary.Tests.ps1
+++ b/CanaryValidator/Canary.Tests.ps1
@@ -569,7 +569,9 @@ while ($runCount -le $NumberOfIterations)
 
         Invoke-Usecase -Name 'RegisterResourceProviders' -Description "Register resource providers" -UsecaseBlock `
         {
-            ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault") | ForEach-Object {Get-AzureRmResourceProvider -ProviderNamespace $_} | Register-AzureRmResourceProvider -Force
+            $parameters = @{}
+            if ((Get-Module AzureRM -ListAvailable).Version -le "1.2.10") {$parameters = @{"Force" = $True}}
+            ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault") | ForEach-Object {Get-AzureRmResourceProvider -ProviderNamespace $_} | Register-AzureRmResourceProvider @parameters
             $sleepTime = 0        
             while($true)
             {
diff --git a/CanaryValidator/azuredeploy.json b/CanaryValidator/azuredeploy.json
index 3e97d678..81c0a1a6 100644
--- a/CanaryValidator/azuredeploy.json
+++ b/CanaryValidator/azuredeploy.json
@@ -648,7 +648,7 @@
         {
             "apiVersion": "[variables('apiVersion')]",
             "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/Microsoft.Insights.VMDiagnosticsSettings')]",           
+            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/VMDiagnosticsSettings')]",           
             "location": "[variables('location')]",
             "dependsOn": [
                 "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName3'))]",
diff --git a/CanaryValidator/azuredeploy.nolinux.json b/CanaryValidator/azuredeploy.nolinux.json
index 0d24c906..26869da7 100644
--- a/CanaryValidator/azuredeploy.nolinux.json
+++ b/CanaryValidator/azuredeploy.nolinux.json
@@ -547,7 +547,7 @@
         {
             "apiVersion": "[variables('apiVersion')]",
             "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/Microsoft.Insights.VMDiagnosticsSettings')]",           
+            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/VMDiagnosticsSettings')]",           
             "location": "[variables('location')]",
             "dependsOn": [
                 "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName3'))]",