diff --git a/intune-policies/compliance-policies/NMM Windows Advanced Compliancy.json b/intune-policies/compliance-policies/NMM Windows Advanced Compliancy.json
index f8f793f..8016228 100644
--- a/intune-policies/compliance-policies/NMM Windows Advanced Compliancy.json	
+++ b/intune-policies/compliance-policies/NMM Windows Advanced Compliancy.json	
@@ -19,6 +19,9 @@
     "mobileOsMinimumVersion": null,
     "mobileOsMaximumVersion": null,
     "earlyLaunchAntiMalwareDriverEnabled": false,
+    "firmwareProtectionEnabled": false,
+    "kernelDmaProtectionEnabled": false,
+    "memoryIntegrityEnabled": false,
     "bitLockerEnabled": true,
     "secureBootEnabled": true,
     "codeIntegrityEnabled": true,
@@ -36,5 +39,6 @@
     "tpmRequired": true,
     "deviceCompliancePolicyScript": null,
     "validOperatingSystemBuildRanges": [],
+    "virtualizationBasedSecurityEnabled": false,
     "scheduledActionsForRule": []
-}
+}
\ No newline at end of file
diff --git a/intune-policies/compliance-policies/NMM Windows Basic Compliancy (no TPM).json b/intune-policies/compliance-policies/NMM Windows Basic Compliancy (no TPM).json
index 4144b7a..18ce203 100644
--- a/intune-policies/compliance-policies/NMM Windows Basic Compliancy (no TPM).json	
+++ b/intune-policies/compliance-policies/NMM Windows Basic Compliancy (no TPM).json	
@@ -19,6 +19,9 @@
     "mobileOsMinimumVersion": null,
     "mobileOsMaximumVersion": null,
     "earlyLaunchAntiMalwareDriverEnabled": false,
+    "firmwareProtectionEnabled": false,
+    "kernelDmaProtectionEnabled": false,
+    "memoryIntegrityEnabled": false,
     "bitLockerEnabled": false,
     "secureBootEnabled": false,
     "codeIntegrityEnabled": false,
@@ -36,5 +39,6 @@
     "tpmRequired": false,
     "deviceCompliancePolicyScript": null,
     "validOperatingSystemBuildRanges": [],
+    "virtualizationBasedSecurityEnabled": false,
     "scheduledActionsForRule": []
-}
+}
\ No newline at end of file
diff --git a/intune-policies/configuration-policies/NMM Enable Windows LAPS.json b/intune-policies/configuration-policies/NMM Enable Windows LAPS.json
index a8f999b..b0d3107 100644
--- a/intune-policies/configuration-policies/NMM Enable Windows LAPS.json	
+++ b/intune-policies/configuration-policies/NMM Enable Windows LAPS.json	
@@ -10,7 +10,6 @@
     "technologies": "mdm",
     "templateReference": {
         "templateId": "adc46e5a-f4aa-4ff6-aeff-4f27bc525796_1",
-        "templateFamily@odata.type": "#microsoft.graph.deviceManagementConfigurationTemplateFamily",
         "templateFamily": "endpointSecurityAccountProtection",
         "templateDisplayName": "Local admin password solution (Windows LAPS)",
         "templateDisplayVersion": "Version 1"
@@ -22,14 +21,11 @@
                 "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance",
                 "settingDefinitionId": "device_vendor_msft_laps_policies_backupdirectory",
                 "settingInstanceTemplateReference": {
-                    "@odata.type": "#microsoft.graph.deviceManagementConfigurationSettingInstanceTemplateReference",
                     "settingInstanceTemplateId": "a3270f64-e493-499d-8900-90290f61ed8a"
                 },
                 "choiceSettingValue": {
-                    "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue",
                     "value": "device_vendor_msft_laps_policies_backupdirectory_1",
                     "settingValueTemplateReference": {
-                        "@odata.type": "#microsoft.graph.deviceManagementConfigurationSettingValueTemplateReference",
                         "settingValueTemplateId": "4d90f03d-e14c-43c4-86da-681da96a2f92",
                         "useTemplateDefault": false
                     },
@@ -43,14 +39,11 @@
                 "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance",
                 "settingDefinitionId": "device_vendor_msft_laps_policies_postauthenticationactions",
                 "settingInstanceTemplateReference": {
-                    "@odata.type": "#microsoft.graph.deviceManagementConfigurationSettingInstanceTemplateReference",
                     "settingInstanceTemplateId": "d9282eb1-d187-42ae-b366-7081f32dcfff"
                 },
                 "choiceSettingValue": {
-                    "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue",
                     "value": "device_vendor_msft_laps_policies_postauthenticationactions_3",
                     "settingValueTemplateReference": {
-                        "@odata.type": "#microsoft.graph.deviceManagementConfigurationSettingValueTemplateReference",
                         "settingValueTemplateId": "68ff4f78-baa8-4b32-bf3d-5ad5566d8142",
                         "useTemplateDefault": false
                     },