From 1db42f151baa71d3949bfdf191970daaab9d19ff Mon Sep 17 00:00:00 2001
From: "James Robinson [MVP]"
<104939301+SkipToTheEndpoint@users.noreply.github.com>
Date: Thu, 5 Nov 2026 15:49:14 +0000
Subject: [PATCH 1/3] Policy update
---
... - Administrator Protection - v4.0.1.json} | 130 +++++++++---------
1 file changed, 66 insertions(+), 64 deletions(-)
rename WINDOWS/IntuneManagement/SettingsCatalog/{Win - OIB - SC - Device Security - D - Administrator Protection - v3.7.json => Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1.json} (58%)
diff --git a/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Administrator Protection - v3.7.json b/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1.json
similarity index 58%
rename from WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Administrator Protection - v3.7.json
rename to WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1.json
index 5f93daf..d7526e5 100644
--- a/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Administrator Protection - v3.7.json
+++ b/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1.json
@@ -1,108 +1,110 @@
{
"@odata.context": "https://graph.microsoft.com/beta/$metadata#deviceManagement/configurationPolicies(assignments(),settings())/$entity",
+ "@odata.editLink": "deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')",
+ "@odata.id": "deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')",
"@odata.type": "#microsoft.graph.deviceManagementConfigurationPolicy",
- "@odata.id": "deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')",
- "@odata.editLink": "deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')",
+ "assignments@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/assignments/$ref",
+ "assignments@odata.context": "https://graph.microsoft.com/beta/$metadata#deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/assignments",
+ "assignments@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/assignments",
"createdDateTime@odata.type": "#DateTimeOffset",
- "createdDateTime": "2024-10-01T15:27:29.2560743Z",
- "creationSource": null,
- "description": "OIBID:E100EBFD-8D2E-40AC-A9A3-48DBF6764144",
+ "createdDateTime": "2026-11-05T12:36:49.2219233Z",
"lastModifiedDateTime@odata.type": "#DateTimeOffset",
- "lastModifiedDateTime": "2025-06-12T10:03:26.2772461Z",
- "name": "Win - OIB - SC - Device Security - D - Administrator Protection - v3.7",
+ "lastModifiedDateTime": "2026-11-05T12:37:25.9508776Z",
"platforms@odata.type": "#microsoft.graph.deviceManagementConfigurationPlatforms",
"platforms": "windows10",
- "priorityMetaData": null,
"roleScopeTagIds@odata.type": "#Collection(String)",
"roleScopeTagIds": [
"0"
],
- "settingCount": 2,
- "technologies@odata.type": "#microsoft.graph.deviceManagementConfigurationTechnologies",
- "technologies": "mdm",
- "id": "f8dd13fa-9652-4849-a3f7-7bc1d41e7af2",
- "templateReference": {
- "@odata.type": "#microsoft.graph.deviceManagementConfigurationPolicyTemplateReference",
- "templateId": "",
- "templateFamily@odata.type": "#microsoft.graph.deviceManagementConfigurationTemplateFamily",
- "templateFamily": "none",
- "templateDisplayName": null,
- "templateDisplayVersion": null
- },
- "assignments@odata.context": "https://graph.microsoft.com/beta/$metadata#deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/assignments",
- "assignments@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/assignments/$ref",
- "assignments@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/assignments",
- "settings@odata.context": "https://graph.microsoft.com/beta/$metadata#deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings",
- "settings@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings/$ref",
- "settings@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings",
+ "settings@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings/$ref",
+ "settings@odata.context": "https://graph.microsoft.com/beta/$metadata#deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings",
+ "settings@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings",
"settings": [
{
+ "@odata.editLink": "deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('0')",
+ "@odata.id": "deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('0')",
"@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting",
- "@odata.id": "deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('0')",
- "@odata.editLink": "deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('0')",
+ "settingDefinitions@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('0')/settingDefinitions/$ref",
+ "settingDefinitions@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('0')/settingDefinitions",
"id": "0",
"settingInstance": {
"@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance",
- "settingDefinitionId": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_behavioroftheelevationpromptforadministratorprotection",
- "settingInstanceTemplateReference": null,
+ "auditRuleInformation": null,
"choiceSettingValue": {
"@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue",
- "settingValueTemplateReference": null,
- "value": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_behavioroftheelevationpromptforadministratorprotection_1",
"children@odata.type": "#Collection(microsoft.graph.deviceManagementConfigurationSettingInstance)",
- "children": []
- }
- },
- "settingDefinitions@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('0')/settingDefinitions/$ref",
- "settingDefinitions@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('0')/settingDefinitions"
+ "children": [],
+ "settingValueTemplateReference": null,
+ "value": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_behavioroftheelevationpromptforadministratorprotection_1"
+ },
+ "settingDefinitionId": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_behavioroftheelevationpromptforadministratorprotection",
+ "settingInstanceTemplateReference": null
+ }
},
{
+ "@odata.editLink": "deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('1')",
+ "@odata.id": "deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('1')",
"@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting",
- "@odata.id": "deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('1')",
- "@odata.editLink": "deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('1')",
+ "settingDefinitions@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('1')/settingDefinitions/$ref",
+ "settingDefinitions@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/settings('1')/settingDefinitions",
"id": "1",
"settingInstance": {
"@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance",
- "settingDefinitionId": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_typeofadminapprovalmode",
- "settingInstanceTemplateReference": null,
+ "auditRuleInformation": null,
"choiceSettingValue": {
"@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue",
- "settingValueTemplateReference": null,
- "value": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_typeofadminapprovalmode_2",
"children@odata.type": "#Collection(microsoft.graph.deviceManagementConfigurationSettingInstance)",
- "children": []
- }
- },
- "settingDefinitions@odata.associationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('1')/settingDefinitions/$ref",
- "settingDefinitions@odata.navigationLink": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/settings('1')/settingDefinitions"
+ "children": [],
+ "settingValueTemplateReference": null,
+ "value": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_typeofadminapprovalmode_1"
+ },
+ "settingDefinitionId": "device_vendor_msft_policy_config_localpoliciessecurityoptions_useraccountcontrol_typeofadminapprovalmode",
+ "settingInstanceTemplateReference": null
+ }
}
],
+ "technologies@odata.type": "#microsoft.graph.deviceManagementConfigurationTechnologies",
+ "technologies": "mdm",
+ "creationSource": null,
+ "description": "OIBID:32BCF079-FF38-4672-8971-59D399FD34D3",
+ "id": "62e1764e-63ab-4f24-b229-38982fcaea20",
+ "name": "Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1",
+ "priorityMetaData": null,
+ "settingCount": 2,
+ "templateReference": {
+ "@odata.type": "#microsoft.graph.deviceManagementConfigurationPolicyTemplateReference",
+ "templateFamily@odata.type": "#microsoft.graph.deviceManagementConfigurationTemplateFamily",
+ "templateFamily": "none",
+ "templateDisplayName": null,
+ "templateDisplayVersion": null,
+ "templateId": ""
+ },
"#microsoft.graph.assign": {
- "title": "microsoft.graph.assign",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.assign"
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.assign",
+ "title": "microsoft.graph.assign"
},
"#microsoft.graph.clearEnrollmentTimeDeviceMembershipTarget": {
- "title": "microsoft.graph.clearEnrollmentTimeDeviceMembershipTarget",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.clearEnrollmentTimeDeviceMembershipTarget"
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.clearEnrollmentTimeDeviceMembershipTarget",
+ "title": "microsoft.graph.clearEnrollmentTimeDeviceMembershipTarget"
},
"#microsoft.graph.createCopy": {
- "title": "microsoft.graph.createCopy",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.createCopy"
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.createCopy",
+ "title": "microsoft.graph.createCopy"
},
"#microsoft.graph.reorder": {
- "title": "microsoft.graph.reorder",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.reorder"
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.reorder",
+ "title": "microsoft.graph.reorder"
},
"#microsoft.graph.retrieveEnrollmentTimeDeviceMembershipTarget": {
- "title": "microsoft.graph.retrieveEnrollmentTimeDeviceMembershipTarget",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.retrieveEnrollmentTimeDeviceMembershipTarget"
- },
- "#microsoft.graph.setEnrollmentTimeDeviceMembershipTarget": {
- "title": "microsoft.graph.setEnrollmentTimeDeviceMembershipTarget",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.setEnrollmentTimeDeviceMembershipTarget"
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.retrieveEnrollmentTimeDeviceMembershipTarget",
+ "title": "microsoft.graph.retrieveEnrollmentTimeDeviceMembershipTarget"
},
"#microsoft.graph.retrieveLatestUpgradeDefaultBaselinePolicy": {
- "title": "microsoft.graph.retrieveLatestUpgradeDefaultBaselinePolicy",
- "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('f8dd13fa-9652-4849-a3f7-7bc1d41e7af2')/microsoft.graph.retrieveLatestUpgradeDefaultBaselinePolicy"
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.retrieveLatestUpgradeDefaultBaselinePolicy",
+ "title": "microsoft.graph.retrieveLatestUpgradeDefaultBaselinePolicy"
+ },
+ "#microsoft.graph.setEnrollmentTimeDeviceMembershipTarget": {
+ "target": "https://graph.microsoft.com/beta/deviceManagement/configurationPolicies('62e1764e-63ab-4f24-b229-38982fcaea20')/microsoft.graph.setEnrollmentTimeDeviceMembershipTarget",
+ "title": "microsoft.graph.setEnrollmentTimeDeviceMembershipTarget"
}
}
\ No newline at end of file
From 73ef70d0ca7aeecd8b64b9bba62360c6e0939d6e Mon Sep 17 00:00:00 2001
From: "James Robinson [MVP]"
<104939301+SkipToTheEndpoint@users.noreply.github.com>
Date: Thu, 5 Nov 2026 15:49:59 +0000
Subject: [PATCH 2/3] Insert policy description warning (no policy change)
---
... OIB - SC - Device Security - D - Config Refresh - v3.2.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Config Refresh - v3.2.json b/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Config Refresh - v3.2.json
index 59dca6c..fcfc4df 100644
--- a/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Config Refresh - v3.2.json
+++ b/WINDOWS/IntuneManagement/SettingsCatalog/Win - OIB - SC - Device Security - D - Config Refresh - v3.2.json
@@ -6,7 +6,7 @@
"createdDateTime@odata.type": "#DateTimeOffset",
"createdDateTime": "2024-05-08T18:34:30.6525241Z",
"creationSource": null,
- "description": "OIBID:C933DA2A-916F-46D4-B2C8-52459180108B",
+ "description": "WARNING: Config Refresh can cause inconsistent behaviour with certain policies (e.g. Wi-Fi profiles causing brief connectivity interruptions). Assess usage and potential impact against security benefits before enabling.\nOIBID:C933DA2A-916F-46D4-B2C8-52459180108B",
"lastModifiedDateTime@odata.type": "#DateTimeOffset",
"lastModifiedDateTime": "2024-12-05T19:41:08.4361634Z",
"name": "Win - OIB - SC - Device Security - D - Config Refresh - v3.2",
From a8d7089a97bccab2898ec668883aecbde14b2650 Mon Sep 17 00:00:00 2001
From: "James Robinson [MVP]"
<104939301+SkipToTheEndpoint@users.noreply.github.com>
Date: Thu, 5 Nov 2026 15:50:36 +0000
Subject: [PATCH 3/3] Docs update
---
WINDOWS/CHANGELOG.md | 14 +++-
WINDOWS/PolicyManifest.json | 23 ++++--
WINDOWS/README.md | 137 +++++++-----------------------------
WINDOWS/SETTINGSOUTPUT.md | 16 ++---
4 files changed, 61 insertions(+), 129 deletions(-)
diff --git a/WINDOWS/CHANGELOG.md b/WINDOWS/CHANGELOG.md
index 06e6522..8aeb10a 100644
--- a/WINDOWS/CHANGELOG.md
+++ b/WINDOWS/CHANGELOG.md
@@ -1,5 +1,17 @@
# OIB Windows Change Log
+# Windows v4.0.1 - 2026-11-05 - Bug Fix
+## Changed/Updated 🔄️
+### Settings Catalog
+#### 🔄️**Win - OIB - SC - Device Security - D - Administrator Protection**
+After adding the Administrator Protection policy in v3.7, the underlying features has been changed about quite a bit. The feature is now available as of the October 2026 Security Update. Unfortunately, this has apparently caused various issues with LAPS, and MS have updated their own documentation to state this: https://learn.microsoft.com/en-us/windows/security/application-security/application-control/administrator-protection/?tabs=intune#troubleshooting
+
+On the back of an active discussion has been happening on GitHub under Issue [#264](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/issues/264), an identified resolution has being found, and considering the OIB's intention of managing devices via LAPS, the following change has been made:
+
+* Changed "User Account Control Type Of Admin Approval Mode" from `2 - Admin Approval Mode with Administrator protection` to `1 - Legacy Admin Approval Mode`. Resolves [#264](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/issues/264)
+
+---
+
# Windows v4.0 - 2026-09-30 - 26H2 Edition
Windows 11 26H2 is upon us, and with it comes the first major version number bump since the OIB's first "proper" release! Since then it's somehow grown far, far bigger than I ever imagined, and having the opportunity to travel into Europe and the US because people want to listen to me talk about the _little passion project that could_ has been genuinely heart-warming.
@@ -26,7 +38,7 @@ Below is a table of the new compliance policies, the setting being required, and
| Win - OIB - CP - Device Health - U - SecureBoot - v4.0 | SecureBoot | Immediately |
| Win - OIB - CP - Device Health - U - Code Integrity - v4.0 | Code Integrity | Immediately |
| Win - OIB - CP - Device Health - U - BitLocker - v4.0 | BitLocker | 0.5 Days |
-| Win - OIB - CP - Defender - U - Security Intelligence - v4.0 | Microsoft Defender Antimalware
security intelligence up-to-date | 0.25 Days |
+| Win - OIB - CP - Defender - U - Security Intelligence - v4.0 | Microsoft Defender Antimalware
security intelligence up-to-date | Immediately |
| Win - OIB - CP - Defender - U - Real-Time Protection - v4.0 | Real-Time Protection | Immediately |
Keen-eyed among you may notice the absence of what used to form the "Password" compliance policy. My reason for removing these is simple: They're trash.
diff --git a/WINDOWS/PolicyManifest.json b/WINDOWS/PolicyManifest.json
index 7a49bd9..978a302 100644
--- a/WINDOWS/PolicyManifest.json
+++ b/WINDOWS/PolicyManifest.json
@@ -1,8 +1,8 @@
{
"manifestVersion": "1.0",
- "oibVersion": "4.0",
+ "oibVersion": "v4.0.1",
"platform": "Windows",
- "generatedDate": "2026-09-30",
+ "generatedDate": "2026-11-05",
"policies": [
{
"oibId": "92CE33B8-FF64-4604-A18D-35555F26C4BE",
@@ -143,7 +143,9 @@
"addedIn": "3.4",
"status": "active",
"supersededBy": [],
- "conflicts": [],
+ "conflicts": [
+ "445BF199-4BB1-49B3-AB70-FFE4B243AEDC"
+ ],
"skuRequirements": "Enterprise",
"licenseRequirements": "",
"tags": [],
@@ -282,8 +284,8 @@
]
},
{
- "oibId": "E100EBFD-8D2E-40AC-A9A3-48DBF6764144",
- "name": "Win - OIB - SC - Device Security - D - Administrator Protection - v3.7",
+ "oibId": "32BCF079-FF38-4672-8971-59D399FD34D3",
+ "name": "Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1",
"platform": "Windows",
"policyType": "SettingsCatalog",
"scope": "Device",
@@ -294,7 +296,12 @@
"skuRequirements": "",
"licenseRequirements": "",
"tags": [],
- "previousVersions": []
+ "previousVersions": [
+ {
+ "oibVersion": "3.7",
+ "oibId": "E100EBFD-8D2E-40AC-A9A3-48DBF6764144"
+ }
+ ]
},
{
"oibId": "34F6F97C-09AA-446B-9664-1DC87BA5C91A",
@@ -982,7 +989,9 @@
"addedIn": "3.8",
"status": "active",
"supersededBy": [],
- "conflicts": [],
+ "conflicts": [
+ "981FA7C5-6F4F-4338-9802-F9985B6EC3DD"
+ ],
"skuRequirements": "",
"licenseRequirements": "",
"tags": [],
diff --git a/WINDOWS/README.md b/WINDOWS/README.md
index 9677a2c..722a8bc 100644
--- a/WINDOWS/README.md
+++ b/WINDOWS/README.md
@@ -1,118 +1,29 @@
# OpenIntuneBaseline - Windows
-## Intended Use-Case
-The baseline has been designed for, and tested on the following:
+Full documentation is available at **[docs.openintunebaseline.com](https://docs.openintunebaseline.com/platforms/windows/)**.
-### Device:
-* Windows 11 Enterprise (though should also work on Windows 10 Enterprise)
-* Enrolled into Autopilot
-* Autopilot configuration:
- * Deployment Mode - User Driven
- * Join Type - Microsoft Entra Joined
- * User Account Type - Standard
-* Single-user device
-
-### User:
-* Cloud-Only or Hybrid Identity with Entra ID as IdP
-* MFA configured via Conditional Access
-
-### Licensing:
-* M365 Business Premium or M365 E5/A5, or M365 E3/A3 + MDE P1/P2
-
**OR**:
- * Entra ID P1 or P2
- * Office 365 E3/E5, A3/A5 or F3
- * Intune P1
- * Defender for Business or Endpoint P1/P2
-
-> [!NOTE]
-> Some settings may report errors or as "Not Applicable" if the device is running Pro/Business rather than Enterprise.
-
-> [!CAUTION]
-> While many policies should work fine on a Multi-user (Shared) device, there are additional considerations required for these that are not covered by this baseline.
-
-### Addressing Hybrid Join
-The Windows OIB has **not** been designed for hybrid scenarios, and will likely **not work as expected or intended** on hybrid-joined devices.
-
-It is _**Microsoft's recommendation**_ that you move to cloud-native for new devices: https://aka.ms/CloudNativeEndpoints
-
-I would personally recommend maintaining GPO for on-prem devices, and using Intune for cloud-native devices, with the exception of things like Endpoint Analytics, Windows Update for Business and Application Deployment. Applying Intune policy over the top of GPO can cause unexpected results, and should be avoided where possible. Similarly, GPOs may well leave registry keys behind that can cause unexpected results when applying Intune policy.
+The baseline has been designed for, and tested on, Windows 11 Enterprise , Autopilot-enrolled, Microsoft Entra Joined, single-user devices with a standard user account.
> [!IMPORTANT]
-> Successful application of the baseline outside of this configuration cannot be guaranteed.
-
----
-
-## Importing the Baseline:
-Please reference [Importing the Baseline](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki#importing-the-baseline) for information.
-
----
-
-## Baseline Security Posture
-Primary information regarding adherence to security frameworks can be found in the [Wiki](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki#security-framework-adherence), however there are some notable deviations from security Windowss guidance frameworks. These are detailed below:
-
-| Policy | Setting Name | Framework Recommendation | Baseline Setting | Rationale |
-|---|---|---|---|---|
-| Device Security - Local Security Policies | | | | |
-| | Accounts Enable Administrator Account Status | Disabled | Enabled | Allows usage of Windows LAPS without additional configuration or creating a new local user account. |
-| | User Account Control Behavior Of The Elevation Prompt For Standard Users | Automatically deny elevation requests | Prompt for credentials on secure desktop | Maintains standard helpdesk remote support processes capabilities. |
-
-### Comparison against other Security Baselines
-Please see [Baseline Comparison](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki/win-comparison) wiki page for more information.
-
-As of v3.4, I have documented the rationale for not implementing specific settings against the CIS Intune Benchmark.
-[OIB v3.4 vs CIS Intune v3.0.1](OIBvsCIS-Rationale.csv)
-
-### Security Recommendations
-The results of the Defender for Endpoint Security Recommendations page on a baseline-configured device can be viewed below:
-
-[export-tvm-security-recommendations.csv](/WINDOWS/export-tvm-security-recommendations.csv)
-
-Please note that **all** security tools, including Microsoft's own seem to have problems with the fact that CSP's put settings in different registry key locations. This is not an issue with the baseline, and is something that needs to be addressed by the security tool vendors. See the FAQ for more information:
-
-[Security tool _y_ says setting _x_ is not configured but Intune says it's applied correctly!](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki/faq#security-tool-y-says-setting-x-is-not-configured-but-intune-says-its-applied-correctly)
-
-### Included Settings
-* Core device security hardening
-* Device Encryption via BitLocker
-* Google Chrome (Note: Policies are quite "Anti-Chrome" to encourage the use of Edge)
-* Microsoft Edge (Split into multiple policies for easier management)
-* Microsoft Office (Including OneDrive Known Folder Move)
-* Microsoft Defender for Endpoint (AV, Firewall, ASR Rules)
-* Windows LAPS
-* Windows Update for Business (Delivery Optimisation, Telemetry & WUfB Reports)
-* Windows Update Rings (3-ring model of Pilot, UAT & Production)
-* Windows Hello for Business
-
-Almost all policies are Settings Catalog-backed and will show in Devices>Configuration Profiles, however the following will appear in the Endpoint Security section of Intune:
-* Defender Antivirus
-* BitLocker Encryption
-* Windows Firewall
-* Windows Hello for Business
-* Windows LAPS
-
-For a complete list of settings, please consult [SETTINGSOUTPUT](/WINDOWS/SETTINGSOUTPUT.md).
-
-### Known Limitations:
-Due to the wildly differing nature of environments, it is not possible to create a "baseline" for AppLocker or Windows Defender Application Control (WDAC). While the baseline ensures standard users cannot elevate to install applications, apps that do not require elevation or install to a user's AppData folder may not be blocked.
-
----
-
-## Known Issues
-Please see the [Known Issues](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki/win-knownissues) wiki page for more information.
-
----
-
-## Supporting Configuration:
-- **Windows Autopatch** - If your licensing supports it, I would **strongly** recommend implementing Autopatch for management of your Windows Quality, Driver and Feature updates. - [Autopatch Overview](https://learn.microsoft.com/en-us/windows/deployment/windows-autopatch/overview/windows-autopatch-overview)
-- **Windows Update for Business Reports** - With an appropriate Azure subscription, a Log Analytics Workspace can be created to monitor update compliance of devices. - [Additional information](https://learn.microsoft.com/en-us/windows/deployment/update/wufb-reports-overview)
-- **M365 Apps Updates** - Enabling [Cloud Update](https://learn.microsoft.com/en-us/deployoffice/admincenter/cloud-update) through [config.office.com](https://config.office.com/officeSettings/serviceprofile) can ensure Office Apps for Business/Enterprise remain up-to-date on the Monthly Enterprise Channel. Settings in the "Office - Update Settings" policy can remain as Cloud Update takes priority over any other Office management. Ensure the [Inventory](https://config.office.com/officeSettings/inventory) is enabled.
-
-> [!NOTE]
-> Guidance on this can be found in the [Settings Guidance](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki/win-settingsguidance) wiki page.
-
----
-
-## Additional Information:
-
-> [!TIP]
-> For further information, please consult the [FAQ](https://github.com/SkipToTheEndpoint/OpenIntuneBaseline/wiki/faq)
+> The Windows OIB has **not** been designed for hybrid-joined devices, and will likely **not work as expected or intended** on them. Successful application of the baseline outside of its intended configuration cannot be guaranteed.
+
+## Documentation
+
+* [Overview, intended use-case and licensing](https://docs.openintunebaseline.com/platforms/windows/)
+* [Included settings](https://docs.openintunebaseline.com/platforms/windows/included-settings/)
+* [Security posture and framework deviations](https://docs.openintunebaseline.com/platforms/windows/security-posture/)
+* [Settings guidance](https://docs.openintunebaseline.com/platforms/windows/settings-guidance/)
+* [Known issues](https://docs.openintunebaseline.com/platforms/windows/known-issues/)
+* [Baseline comparison](https://docs.openintunebaseline.com/platforms/windows/baseline-comparison/)
+* [Supporting scripts](https://docs.openintunebaseline.com/platforms/windows/scripts/)
+* [Importing the baseline](https://docs.openintunebaseline.com/getting-started/importing/)
+* [FAQ](https://docs.openintunebaseline.com/faq/)
+
+## In this folder
+
+* [CHANGELOG.md](CHANGELOG.md) - Change log
+* [SETTINGSOUTPUT.md](SETTINGSOUTPUT.md) - Complete list of settings. A searchable view is available on [intunesettings.app](https://intunesettings.app/baseline/).
+* [OIB4.0-CIS5.0.0-DeviationRationale.csv](OIB4.0-CIS5.0.0-DeviationRationale.csv) - OIB v4.0 vs CIS Intune v5.0.0 deviation rationale
+* [PolicyManifest.json](PolicyManifest.json) - Policy tracking data (OIBIDs)
+* [IntuneManagement](IntuneManagement) - Policy exports for the IntuneManagement tool
+* [Scripts](Scripts) - Optional supporting scripts
diff --git a/WINDOWS/SETTINGSOUTPUT.md b/WINDOWS/SETTINGSOUTPUT.md
index 174c58b..9a8b11d 100644
--- a/WINDOWS/SETTINGSOUTPUT.md
+++ b/WINDOWS/SETTINGSOUTPUT.md
@@ -2084,7 +2084,7 @@
###### Table 32. Settings - Win - OIB - SC - Defender Antivirus - D - Additional Configuration - v4.0
-
Win - OIB - SC - Device Security - D - Administrator Protection - v3.7
+Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1
| Name |
-Win - OIB - SC - Device Security - D - Administrator Protection - v3.7 |
+Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1 |
| Description |
-OIBID:E100EBFD-8D2E-40AC-A9A3-48DBF6764144 |
+OIBID:32BCF079-FF38-4672-8971-59D399FD34D3 |
| Profile type |
@@ -2112,11 +2112,11 @@
| Created |
-30 September 2026 18:21:50 |
+5 November 2026 12:36:49 |
| Last modified |
-30 September 2026 18:21:50 |
+5 November 2026 12:37:25 |
| Scope tags |
@@ -2124,7 +2124,7 @@
-###### Table 33. Basics - Win - OIB - SC - Device Security - D - Administrator Protection - v3.7
+###### Table 33. Basics - Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1
@@ -2141,11 +2141,11 @@
| User Account Control Type Of Admin Approval Mode |
-Admin Approval Mode with Administrator protection |
+Legacy Admin Approval Mode |
-###### Table 34. Settings - Win - OIB - SC - Device Security - D - Administrator Protection - v3.7
+###### Table 34. Settings - Win - OIB - SC - Device Security - D - Administrator Protection - v4.0.1
Win - OIB - SC - Device Security - D - Audit and Event Logging - v4.0