diff --git a/src/sxsc/Atlas-NoTelemetry-Arm.yaml b/src/sxsc/Atlas-NoTelemetry-Arm.yaml
index 0550c1efde..20bca0993c 100644
--- a/src/sxsc/Atlas-NoTelemetry-Arm.yaml
+++ b/src/sxsc/Atlas-NoTelemetry-Arm.yaml
@@ -112,9 +112,11 @@ updates:
   - target_component: Microsoft-Windows-DataCollection-Adm.Resources
     target_arch: arm64
     version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-DeviceCensus
-    target_arch: arm64
-    version: 38655.38527.65535.65535
+    # Required for Application Compatibility (PcaSvc)
+    # It's disabled by default on Atlas, but this should still be kept
+  # - target_component: Microsoft-Windows-DeviceCensus
+  #   target_arch: arm64
+  #   version: 38655.38527.65535.65535
   - target_component: Microsoft-Windows-DeviceCensus-Schedule-ClientServer
     target_arch: arm64
     version: 38655.38527.65535.65535
@@ -187,53 +189,3 @@ updates:
   - target_component: Windows-System-Diagnostics-Telemetry-PlatformTelemetryClient
     target_arch: arm64.x86
     version: 38655.38527.65535.65535
-
-    # CEIP/SQM - Windows Customer Experience Program
-  - target_component: Microsoft-Windows-AcProxy
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-AcProxy.Resources
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-CEIPEnable-Adm
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-CEIPEnable-Adm.Resources
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-CEIPEnable-Adm-Deployment
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-CEIPEnable-Adm-Deployment-LanguagePack
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-Client-SQM-Consolidator
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQMApi
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQMApi
-    target_arch: arm64.arm
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQMApi
-    target_arch: arm64.x86
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQM-Consolidator-Base
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQM-Consolidator-Base.Resources
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip
-    target_arch: arm64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip
-    target_arch: arm64.arm
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip
-    target_arch: arm64.x86
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip.Resources
-    target_arch: arm64
-    version: 38655.38527.65535.65535
diff --git a/src/sxsc/Atlas-NoTelemetry.yaml b/src/sxsc/Atlas-NoTelemetry.yaml
index 5ccc190055..1070dc2fee 100644
--- a/src/sxsc/Atlas-NoTelemetry.yaml
+++ b/src/sxsc/Atlas-NoTelemetry.yaml
@@ -112,9 +112,11 @@ updates:
   - target_component: Microsoft-Windows-DataCollection-Adm.Resources
     target_arch: amd64
     version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-DeviceCensus
-    target_arch: amd64
-    version: 38655.38527.65535.65535
+    # Required for Application Compatibility (PcaSvc)
+    # It's disabled by default on Atlas, but this should still be kept
+  # - target_component: Microsoft-Windows-DeviceCensus
+  #   target_arch: amd64
+  #   version: 38655.38527.65535.65535
   - target_component: Microsoft-Windows-DeviceCensus-Schedule-ClientServer
     target_arch: amd64
     version: 38655.38527.65535.65535
@@ -178,41 +180,3 @@ updates:
   - target_component: Windows-System-Diagnostics-Telemetry-PlatformTelemetryClient
     target_arch: wow64
     version: 38655.38527.65535.65535
-
-    # CEIP/SQM - Windows Customer Experience Program
-  - target_component: Microsoft-Windows-AcProxy
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-AcProxy.Resources
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-CEIPEnable-Adm
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-CEIPEnable-Adm.Resources
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-Client-SQM-Consolidator
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQMApi
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQMApi
-    target_arch: wow64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQM-Consolidator-Base
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-SQM-Consolidator-Base.Resources
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip
-    target_arch: amd64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip
-    target_arch: wow64
-    version: 38655.38527.65535.65535
-  - target_component: Microsoft-Windows-UsbCeip.Resources
-    target_arch: amd64
-    version: 38655.38527.65535.65535