diff --git a/Assets/Features.json b/Assets/Features.json
index 7299d8a..6d781fd 100644
--- a/Assets/Features.json
+++ b/Assets/Features.json
@@ -374,7 +374,7 @@
     {
       "FeatureId": "DisableLocationServices",
       "Label": "Windows location services & app location access",
-      "ToolTip": "This will turn off Windows Location Services and deny apps access to your location.",
+      "ToolTip": "This will turn off Windows Location Services and deny apps access to your location. This feature uses policies, some settings will be locked.",
       "Category": "Privacy & Suggested Content",
       "Action": "Disable",
       "RegistryKey": "Disable_Location_Services.reg",
diff --git a/Regfiles/Disable_Location_Services.reg b/Regfiles/Disable_Location_Services.reg
index 0930d84..2b0c567 100644
--- a/Regfiles/Disable_Location_Services.reg
+++ b/Regfiles/Disable_Location_Services.reg
@@ -1,9 +1,4 @@
 Windows Registry Editor Version 5.00
 
-; Disable the Windows Location Service (system-wide)
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location]
-"Value"="Deny"
-
-; Deny app access to location for the current user
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location]
-"Value"="Deny"
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors]
+"DisableLocation"=dword:00000001
diff --git a/Regfiles/Sysprep/Disable_Location_Services.reg b/Regfiles/Sysprep/Disable_Location_Services.reg
index e63dd75..2b0c567 100644
--- a/Regfiles/Sysprep/Disable_Location_Services.reg
+++ b/Regfiles/Sysprep/Disable_Location_Services.reg
@@ -1,9 +1,4 @@
 Windows Registry Editor Version 5.00
 
-; Disable the Windows Location Service (system-wide)
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location]
-"Value"="Deny"
-
-; Deny app access to location for new/default users
-[hkey_users\default\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location]
-"Value"="Deny"
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors]
+"DisableLocation"=dword:00000001
diff --git a/Regfiles/Undo/Enable_Location_Services.reg b/Regfiles/Undo/Enable_Location_Services.reg
index 89976bf..0f62d2f 100644
--- a/Regfiles/Undo/Enable_Location_Services.reg
+++ b/Regfiles/Undo/Enable_Location_Services.reg
@@ -1,9 +1,4 @@
 Windows Registry Editor Version 5.00
 
-; Re-enable the Windows Location Service (system-wide)
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location]
-"Value"="Allow"
-
-; Re-allow app access to location for the current user
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location]
-"Value"="Allow"
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors]
+"DisableLocation"=-