diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c
index f396752ef..2e6bce0ab 100644
--- a/lib/el3_runtime/aarch64/context_mgmt.c
+++ b/lib/el3_runtime/aarch64/context_mgmt.c
@@ -191,6 +191,16 @@ static void setup_realm_context(cpu_context_t *ctx, const struct entry_point_inf
 	}
 
 	write_ctx_reg(state, CTX_SCR_EL3, scr_el3);
+
+	if (is_feat_fgt2_supported()) {
+		fgt2_enable(ctx);
+	}
+
+	if (is_feat_debugv8p9_supported()) {
+		debugv8p9_extended_bp_wp_enable(ctx);
+	}
+
+
 }
 #endif /* ENABLE_RME */