diff --git a/tf_config/fvp-ras-ffh-spmd-lsp b/tf_config/fvp-ras-ffh-spmd-lsp
index bc947c7..88e330f 100644
--- a/tf_config/fvp-ras-ffh-spmd-lsp
+++ b/tf_config/fvp-ras-ffh-spmd-lsp
@@ -2,6 +2,7 @@
 PLAT=fvp
 SPD=spmd
 ENABLE_SPMD_LP=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm b/tf_config/fvp-spm
index fdb544f..866a144 100644
--- a/tf_config/fvp-spm
+++ b/tf_config/fvp-spm
@@ -3,6 +3,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-hyp b/tf_config/fvp-spm-hyp
index 5e16c1e..fcc6b10 100644
--- a/tf_config/fvp-spm-hyp
+++ b/tf_config/fvp-spm-hyp
@@ -5,6 +5,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-measured-boot b/tf_config/fvp-spm-measured-boot
index df36444..c357f34 100644
--- a/tf_config/fvp-spm-measured-boot
+++ b/tf_config/fvp-spm-measured-boot
@@ -3,6 +3,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-optee-sp b/tf_config/fvp-spm-optee-sp
index d4b76bd..4f1e7d8 100644
--- a/tf_config/fvp-spm-optee-sp
+++ b/tf_config/fvp-spm-optee-sp
@@ -1,3 +1,4 @@
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-report-ctx-mem-use b/tf_config/fvp-spm-report-ctx-mem-use
index 886956c..5293356 100644
--- a/tf_config/fvp-spm-report-ctx-mem-use
+++ b/tf_config/fvp-spm-report-ctx-mem-use
@@ -3,6 +3,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-rst-bl31 b/tf_config/fvp-spm-rst-bl31
index 418b4c5..a840c90 100644
--- a/tf_config/fvp-spm-rst-bl31
+++ b/tf_config/fvp-spm-rst-bl31
@@ -7,6 +7,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-spmd-lsp b/tf_config/fvp-spm-spmd-lsp
index 1d8f20f..7b43eb5 100644
--- a/tf_config/fvp-spm-spmd-lsp
+++ b/tf_config/fvp-spm-spmd-lsp
@@ -2,6 +2,7 @@
 PLAT=fvp
 SPD=spmd
 ENABLE_SPMD_LP=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-sve b/tf_config/fvp-spm-sve
index 02f4373..3b6eaba 100644
--- a/tf_config/fvp-spm-sve
+++ b/tf_config/fvp-spm-sve
@@ -1,5 +1,6 @@
 CROSS_COMPILE=aarch64-none-elf-
 PLAT=fvp
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 BRANCH_PROTECTION=1
 CTX_INCLUDE_EL2_REGS=1
diff --git a/tf_config/fvp-spm-tbb b/tf_config/fvp-spm-tbb
index 5539141..741a6ab 100644
--- a/tf_config/fvp-spm-tbb
+++ b/tf_config/fvp-spm-tbb
@@ -3,6 +3,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-spm-tbb-dualroot b/tf_config/fvp-spm-tbb-dualroot
index dc80aa3..6a23ac0 100644
--- a/tf_config/fvp-spm-tbb-dualroot
+++ b/tf_config/fvp-spm-tbb-dualroot
@@ -3,6 +3,7 @@
 SPD=spmd
 SPMD_SPM_AT_SEL2=1
 CTX_INCLUDE_EL2_REGS=1
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 CTX_INCLUDE_PAUTH_REGS=1
 ENABLE_FEAT_MTE2=1
diff --git a/tf_config/fvp-tc2-spm b/tf_config/fvp-tc2-spm
index 18341f6..0c4fd57 100644
--- a/tf_config/fvp-tc2-spm
+++ b/tf_config/fvp-tc2-spm
@@ -1,3 +1,4 @@
+ARM_ARCH_MAJOR=8
 ARM_ARCH_MINOR=5
 ARM_GPT_SUPPORT=1
 BRANCH_PROTECTION=1