diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
index a22d9ab699c..91d615c1804 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule
@@ -281,7 +281,7 @@ group gL2FIR filter singlebit, cs_root_cause
     /** L2FIR[6]
      *  L2 directory read CE
      */
-    (rL2FIR, bit(6)) ? self_th_32perDay;
+    (rL2FIR, bit(6)) ? l2_dir_ce;
 
     /** L2FIR[7]
      *  L2 directory read UE
@@ -648,7 +648,7 @@ group gL3FIR filter singlebit, cs_root_cause
     /** L3FIR[13]
      *  L3 DIR read CE
      */
-    (rL3FIR, bit(13)) ? self_th_32perDay;
+    (rL3FIR, bit(13)) ? l3_dir_ce;
 
     /** L3FIR[14]
      *  L3 Dir read UE
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule
index 651917345f5..72147a05323 100644
--- a/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule
+++ b/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -35,9 +35,17 @@ actionclass l3_cache_ue
     TBDDefaultCallout;
 };
 
+actionclass l3_dir_ce
+{
+    calloutSelfHigh;
+    threshold( field(32 / day), mfg_file(ATTR_MNFG_TH_P8EX_L3_DIR_CES) );
+};
+
 actionclass l2_cache_ce
 {
-    TBDDefaultCallout;
+    calloutSelfHigh;
+    threshold( field(32 / day), mfg_file(ATTR_MNFG_TH_P8EX_L2_CACHE_CES) );
+#    funccall("L2CE"); TODO: RTC 152593
 };
 
 actionclass l2_cache_ue
@@ -45,6 +53,12 @@ actionclass l2_cache_ue
     TBDDefaultCallout;
 };
 
+actionclass l2_dir_ce
+{
+    calloutSelfHigh;
+    threshold( field(32 / day), mfg_file(ATTR_MNFG_TH_P8EX_L2_DIR_CES) );
+};
+
 actionclass l2_power_bus_ce
 {
     TBDDefaultCallout;