diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index c943973..0eb5e64 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -14,6 +14,7 @@
     apex_info_file
     apex_ota_reserved_file
     apex_scheduling_data_file
+    apex_system_server_data_file
     apexd_config_prop
     app_hibernation_service
     appcompat_data_file
diff --git a/private/compat/31.0/31.0.cil b/private/compat/31.0/31.0.cil
index 1176046..c33bc73 100644
--- a/private/compat/31.0/31.0.cil
+++ b/private/compat/31.0/31.0.cil
@@ -1,3 +1,9 @@
+;; types removed from current policy
+(type apex_appsearch_data_file)
+(type apex_permission_data_file)
+(type apex_scheduling_data_file)
+(type apex_wifi_data_file)
+
 (expandtypeattribute (DockObserver_service_31_0) true)
 (expandtypeattribute (IProxyService_service_31_0) true)
 (expandtypeattribute (aac_drc_prop_31_0) true)
@@ -1250,18 +1256,18 @@
 (typeattributeset alarm_service_31_0 (alarm_service))
 (typeattributeset anr_data_file_31_0 (anr_data_file))
 (typeattributeset apc_service_31_0 (apc_service))
-(typeattributeset apex_appsearch_data_file_31_0 (apex_appsearch_data_file))
+(typeattributeset apex_appsearch_data_file_31_0 (apex_appsearch_data_file apex_system_server_data_file))
 (typeattributeset apex_data_file_31_0 (apex_data_file))
 (typeattributeset apex_info_file_31_0 (apex_info_file))
 (typeattributeset apex_metadata_file_31_0 (apex_metadata_file))
 (typeattributeset apex_mnt_dir_31_0 (apex_mnt_dir))
 (typeattributeset apex_module_data_file_31_0 (apex_module_data_file))
 (typeattributeset apex_ota_reserved_file_31_0 (apex_ota_reserved_file))
-(typeattributeset apex_permission_data_file_31_0 (apex_permission_data_file))
+(typeattributeset apex_permission_data_file_31_0 (apex_permission_data_file apex_system_server_data_file))
 (typeattributeset apex_rollback_data_file_31_0 (apex_rollback_data_file))
-(typeattributeset apex_scheduling_data_file_31_0 (apex_scheduling_data_file))
+(typeattributeset apex_scheduling_data_file_31_0 (apex_scheduling_data_file apex_system_server_data_file))
 (typeattributeset apex_service_31_0 (apex_service))
-(typeattributeset apex_wifi_data_file_31_0 (apex_wifi_data_file))
+(typeattributeset apex_wifi_data_file_31_0 (apex_wifi_data_file apex_system_server_data_file))
 (typeattributeset apexd_31_0 (apexd))
 (typeattributeset apexd_config_prop_31_0 (apexd_config_prop))
 (typeattributeset apexd_exec_31_0 (apexd_exec))