diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
index d7ed4bd..85d3e13 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
@@ -25,13 +25,15 @@
         test_name='cheets_CTS_P.9.0_dev.arm.waivers',
         run_template=['run', 'commandAndExit', 'cts',
             '--include-filter', 'CtsSkQPTestCases',
-            '--include-filter', 'CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testConserveMemoryPlusHardware'],
+            '--include-filter', 'CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testConserveMemoryPlusHardware',
+            '--include-filter', 'CtsAppSecurityHostTestCases android.appsecurity.cts.PermissionsHostTest#testCompatRevoked22',
+            '--include-filter', 'CtsAppSecurityHostTestCases android.appsecurity.cts.PermissionsHostTest#testRevokePropagatedOnUpgradeOldToNewModel'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='cts-dev',
         target_plan=None,
         load_waivers=False,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-5838791-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-5866778-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
index ab8dd1d..8032e22 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
@@ -25,13 +25,15 @@
         test_name='cheets_CTS_P.9.0_dev.x86.waivers',
         run_template=['run', 'commandAndExit', 'cts',
             '--include-filter', 'CtsSkQPTestCases',
-            '--include-filter', 'CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testConserveMemoryPlusHardware'],
+            '--include-filter', 'CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testConserveMemoryPlusHardware',
+            '--include-filter', 'CtsAppSecurityHostTestCases android.appsecurity.cts.PermissionsHostTest#testCompatRevoked22',
+            '--include-filter', 'CtsAppSecurityHostTestCases android.appsecurity.cts.PermissionsHostTest#testRevokePropagatedOnUpgradeOldToNewModel'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='cts-dev',
         target_plan=None,
         load_waivers=False,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-5838791-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-5866778-linux_x86-x86.zip',
         timeout=14400)
 
 parallel_simple(run_CTS, machines)