diff --git a/Makefile b/Makefile
index 8adc0d05b..b42e4ec25 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,10 @@ endif
 CTX_INCLUDE_EL2_REGS := 1
 CTX_INCLUDE_AARCH32_REGS := 0
 ARM_ARCH_MAJOR := 8
-ARM_ARCH_MINOR := 6
+ARM_ARCH_MINOR := 5
+ENABLE_FEAT_ECV = 1
+ENABLE_FEAT_FGT = 1
+
 endif
 
 # USE_SPINLOCK_CAS requires AArch64 build