diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c
index 135bd6b86d..3d39acd50c 100644
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.c
@@ -40,12 +40,15 @@ ArmCpuSetup (
   }
 
   //
-  // If CPU is CortexA57 r0p0 apply Errata: 806969
+  // If CPU is CortexA57 r0p0 apply Errata workarounds
   //
   if ((ArmReadMidr () & ((ARM_CPU_TYPE_MASK << 4) | ARM_CPU_REV_MASK)) ==
                          ((ARM_CPU_TYPE_A57 << 4) | ARM_CPU_REV(0,0))) {
-    // DisableLoadStoreWB
-    ArmSetCpuActlrBit (1ULL << 49);
+
+    // Errata 806969: DisableLoadStoreWB (1ULL << 49)
+    // Errata 813420: Execute Data Cache clean as Data Cache clean/invalidate  (1ULL << 44)
+    // Errata 814670: disable DMB nullification (1ULL << 58)
+    ArmSetCpuActlrBit ( (1ULL << 49) | (1ULL << 44) | (1ULL << 58) );
   }
 }