diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index 457bedd..b54c5f3 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -10,7 +10,7 @@ on:
       resource_priority_list:
         type: string
         description: Priority list for resources (you can remove unnecessary resources during testing)
-        default: '["storage", "webapp", "vnet", "network", "vm", "synapse", "sql", "mysql", "subscription", "disk", "postgresql", "cosmosdb", "signalr", "spring", "search", "service-fabric", "stream", "redis", "servicebus", "role", "monitor", "machine-learning", "logic", "kusto", "aks", "keyvault", "iothub", "front-door", "event", "data", "defender", "container", "cognitiveservice", "batch", "automation", "application", "app-configuration", "api", "alert"]'
+        default: '["storage", "vnet", "vm", "disk", "spring"]'
         #'["storage", "webapp", "vnet", "network", "vm", "synapse", "sql", "mysql", "subscription", "disk", "postgresql", "cosmosdb", "signalr", "spring", "search", "service-fabric", "stream", "redis", "servicebus", "role", "monitor", "machine-learning", "logic", "kusto", "aks", "keyvault", "iothub", "front-door", "event", "data", "defender", "container", "cognitiveservice", "batch", "automation", "application", "app-configuration", "api", "alert"]'
         required: true
 
@@ -24,7 +24,7 @@ env:
   AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
   AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
   AZURE_SECRET_VALUE: ${{ secrets.AZURE_SECRET_VALUE }}
-  default_resource_priority_list: '["storage", "webapp", "vnet", "network", "vm", "synapse", "sql", "mysql", "subscription", "disk", "postgresql", "cosmosdb", "signalr", "spring", "search", "service-fabric", "stream", "redis", "servicebus", "role", "monitor", "machine-learning", "logic", "kusto", "aks", "keyvault", "iothub", "front-door", "event", "data", "defender", "container", "cognitiveservice", "batch", "automation", "application", "app-configuration", "api", "alert"]'
+  default_resource_priority_list: '["storage", "vnet", "vm", "disk", "spring"]'
   #default_resource_priority_list: '["storage", "webapp", "vnet", "network", "vm", "synapse", "sql", "mysql", "subscription", "disk", "postgresql", "cosmosdb", "signalr", "spring", "search", "service-fabric", "stream", "redis", "servicebus", "role", "monitor", "machine-learning", "logic", "kusto", "aks", "keyvault", "iothub", "front-door", "event", "data", "defender", "container", "cognitiveservice", "batch", "automation", "application", "app-configuration", "api", "alert"]'
   TF_VAR_project: ${{ secrets.TF_VAR_project }}
   TF_VAR_region: ${{ secrets.AWS_REGION }}
diff --git a/auto_policy_testing/green/vm/extension.tf b/auto_policy_testing/green/vm/extension.tf
index 05b514f..fcad74f 100644
--- a/auto_policy_testing/green/vm/extension.tf
+++ b/auto_policy_testing/green/vm/extension.tf
@@ -42,24 +42,12 @@ resource "azurerm_virtual_machine_extension" "win2" {
 }
 
 resource "azurerm_virtual_machine_extension" "win3" {
-  name                 = "vm-win4ext"
   virtual_machine_id   = azurerm_windows_virtual_machine.this.id
-  publisher            = "Microsoft.EnterpriseCloud.Monitoring"
-  type                 = "MicrosoftMonitoringAgent"
-  type_handler_version = "1.0"
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${data.terraform_remote_state.common.outputs.workspace_id}"
-    }
-    SETTINGS   
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey": "${data.terraform_remote_state.common.outputs.workspace_key}"
-    }
-    PROTECTED_SETTINGS
-
-  tags = module.naming.default_tags
+  name                       = "AzureMonitorWindowsAgent"
+  publisher                  = "Microsoft.Azure.Monitor"
+  type                       = "AzureMonitorWindowsAgent"
+  type_handler_version       = "1.0"
+  auto_upgrade_minor_version = "true"
 
   depends_on = [azurerm_virtual_machine_extension.win2]
 }
@@ -123,11 +111,11 @@ resource "azurerm_virtual_machine_scale_set_extension" "vmsswin2" {
 
 resource "azurerm_virtual_machine_scale_set_extension" "vmsswin3" {
   virtual_machine_scale_set_id = azurerm_windows_virtual_machine_scale_set.this.id
-  auto_upgrade_minor_version   = true
-  name                         = "MicrosoftMonitoringAgent"
-  publisher                    = "Microsoft.EnterpriseCloud.Monitoring"
-  type                         = "MicrosoftMonitoringAgent"
-  type_handler_version         = "1.0"
+  name                       = "AzureMonitorWindowsAgent"
+  publisher                  = "Microsoft.Azure.Monitor"
+  type                       = "AzureMonitorWindowsAgent"
+  type_handler_version       = "1.0"
+  auto_upgrade_minor_version = "true"
 
   depends_on = [azurerm_virtual_machine_scale_set_extension.vmsswin2]
 }
diff --git a/auto_policy_testing/green/vm/extension_linux.tf b/auto_policy_testing/green/vm/extension_linux.tf
index 3222da0..21ba52c 100644
--- a/auto_policy_testing/green/vm/extension_linux.tf
+++ b/auto_policy_testing/green/vm/extension_linux.tf
@@ -21,24 +21,12 @@ resource "azurerm_virtual_machine_extension" "lin2" {
 }
 
 resource "azurerm_virtual_machine_extension" "lin3" {
-  name                 = "vm-lin3uxext"
   virtual_machine_id   = azurerm_linux_virtual_machine.this.id
-  publisher            = "Microsoft.EnterpriseCloud.Monitoring"
-  type                 = "OmsAgentForLinux"
-  type_handler_version = "1.13"
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${data.terraform_remote_state.common.outputs.workspace_id}"
-    }
-    SETTINGS   
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey": "${data.terraform_remote_state.common.outputs.workspace_key}"
-    }
-    PROTECTED_SETTINGS
-
-  tags = module.naming.default_tags
+  name                       = "AzureMonitorLinuxAgent"
+  publisher                  = "Microsoft.Azure.Monitor"
+  type                       = "AzureMonitorLinuxAgent"
+  type_handler_version       = "1.0"
+  auto_upgrade_minor_version = "true"
 
   depends_on = [azurerm_virtual_machine_extension.lin2]
 }
@@ -53,22 +41,12 @@ resource "azurerm_virtual_machine_scale_set_extension" "linvmss1" {
 }
 
 resource "azurerm_virtual_machine_scale_set_extension" "linvmss2" {
-  name                         = "OmsAgentForLinux"
   virtual_machine_scale_set_id = azurerm_linux_virtual_machine_scale_set.this1.id
-  publisher                    = "Microsoft.EnterpriseCloud.Monitoring"
-  type                         = "OmsAgentForLinux"
-  type_handler_version         = "1.14"
-
-  settings           = <<SETTINGS
-    {
-      "workspaceId": "${data.terraform_remote_state.common.outputs.workspace_id}"
-    }
-    SETTINGS   
-  protected_settings = <<PROTECTED_SETTINGS
-    {
-      "workspaceKey": "${data.terraform_remote_state.common.outputs.workspace_key}"
-    }
-    PROTECTED_SETTINGS
+  name                       = "AzureMonitorLinuxAgent"
+  publisher                  = "Microsoft.Azure.Monitor"
+  type                       = "AzureMonitorLinuxAgent"
+  type_handler_version       = "1.0"
+  auto_upgrade_minor_version = "true"
 
 
   depends_on = [azurerm_virtual_machine_scale_set_extension.linvmss1]