diff --git a/docs/devices.md b/docs/devices.md
index e887f4f..4c2e6d8 100644
--- a/docs/devices.md
+++ b/docs/devices.md
@@ -48,6 +48,21 @@ fvp-morello-grub      |
 fvp-morello-oe        |
 fvp-morello-ubuntu    |
 
+!!! tip "Arm architecture version on fvp-aemva"
+    By default `fvp-aemva` runs the FVP model at Armv9.7, exposing
+    SVE2 v3, SME2 v3, LSFE and the FP16 matrix instructions. Armv9.6
+    made `HCR_EL2.E2H` read-as-one, so nVHE is no longer
+    architecturally possible. Stable kernels that always run the
+    nVHE-flavoured SVE EL2 init (between the refactor in v5.15 and
+    the v6.5 hVHE rework) hang when writing `ZCR_EL2`. In practice
+    that affects **linux-5.15.y** and **linux-6.1.y**. Older kernels
+    (linux-5.10.y) kept a VHE guard around the nVHE setup and still
+    boot at Armv9.7; newer kernels (linux-6.6.y and later) inherit
+    the v6.5 hVHE rework and also boot unchanged. Pass
+    `--parameters FVP_ARM_ARCH_VERSION=9.5` to clamp the model to
+    Armv9.5 for the affected branches. The same knob can be used to
+    target older architecture versions when newer ones cause issues.
+
 # NFS devices
 
 Device                 |
diff --git a/test/unit/refs/definitions/fvp-aemva-arch-v95.yaml b/test/unit/refs/definitions/fvp-aemva-arch-v95.yaml
new file mode 100644
index 0000000..8b8b1a1
--- /dev/null
+++ b/test/unit/refs/definitions/fvp-aemva-arch-v95.yaml
@@ -0,0 +1,189 @@
+device_type: "fvp"
+
+job_name: "tuxlava@fvp-aemva"
+priority: low
+visibility: "public"
+
+
+timeouts:
+  job:
+    minutes: 25
+  action:
+    minutes: 10
+  connection:
+    minutes: 10
+
+actions:
+- deploy:
+    to: fvp
+    timeout:
+      minutes: 15
+    uniquify: False
+    images:
+      startup:
+        url: "/DATA/startup.nsh"
+      uefi:
+        url: "https://storage.tuxboot.com/buildroot/fvp-aemva/FVP_AARCH64_EFI.fd"
+      bl1:
+        url: "/DATA/tf-bl1.bin"
+      dtb:
+        url: "https://storage.tuxboot.com/buildroot/fvp-aemva/fvp-base-revc.dtb"
+      kernel:
+        url: "https://storage.tuxboot.com/buildroot/fvp-aemva/Image"
+      rootfs:
+        url: "https://example.com/rootfs.ext4.zst"
+        compression: zstd
+        format: ext4
+      fip:
+        url: "/DATA/fip.bin"
+- boot:
+    method: fvp
+    docker:
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
+      local: false
+      container_name: "tuxlava-ci"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
+    version_string: "Fast Models [^\\n]+"
+    timeout:
+      minutes: 10
+    console_string: "terminal_0: Listening for serial connection on port (?P<PORT>\\d+)"
+    feedbacks:
+    - "(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\\d+)"
+    - "(?P<NAME>terminal_2): Listening for serial connection on port (?P<PORT>\\d+)"
+    - "(?P<NAME>terminal_3): Listening for serial connection on port (?P<PORT>\\d+)"
+    arguments:
+    - "--stat"
+    - "-C bp.dram_size=4"
+    - "-C bp.flashloader0.fname='{FIP}'"
+    - "-C bp.flashloader1.fname='{UEFI}'"
+    - "-C bp.hostbridge.userNetPorts=8022=22"
+    - "-C bp.hostbridge.userNetworking=1"
+    - "-C bp.refcounter.non_arch_start_at_default=1"
+    - "-C bp.secure_memory=1"
+    - "-C bp.secureflashloader.fname='{BL1}'"
+    - "-C bp.smsc_91c111.enabled=1"
+    - "-C bp.terminal_0.mode=telnet"
+    - "-C bp.terminal_0.start_telnet=0"
+    - "-C bp.terminal_1.mode=raw"
+    - "-C bp.terminal_1.start_telnet=0"
+    - "-C bp.terminal_2.mode=raw"
+    - "-C bp.terminal_2.start_telnet=0"
+    - "-C bp.terminal_3.mode=raw"
+    - "-C bp.terminal_3.start_telnet=0"
+    - "-C bp.ve_sysregs.exit_on_shutdown=1"
+    - "-C bp.virtio_rng.enabled=1"
+    - "-C bp.virtioblockdevice.image_path='{ROOTFS}'"
+    - "-C bp.virtiop9device.root_path="
+    - "-C bp.vis.disable_visualisation=1"
+    - "-C cache_state_modelled=0"
+    - "-C cluster0.NUM_CORES=4"
+    - "-C cluster0.PA_SIZE=48"
+    - "-C cluster0.check_memory_attributes=0"
+    - "-C cluster0.clear_reg_top_eret=2"
+    - "-C cluster0.cpu0.semihosting-cwd={ARTIFACT_DIR}"
+    - "-C cluster0.ecv_support_level=2"
+    - "-C cluster0.enhanced_pac2_level=3"
+    - "-C cluster0.gicv3.cpuintf-mmap-access-level=2"
+    - "-C cluster0.gicv3.without-DS-support=1"
+    - "-C cluster0.gicv4.mask-virtual-interrupt=1"
+    - "-C cluster0.has_16k_granule=1"
+    - "-C cluster0.has_amu=1"
+    - "-C cluster0.has_arm_v8-1=1"
+    - "-C cluster0.has_arm_v8-2=1"
+    - "-C cluster0.has_arm_v8-3=1"
+    - "-C cluster0.has_arm_v8-4=1"
+    - "-C cluster0.has_arm_v8-5=1"
+    - "-C cluster0.has_arm_v8-6=1"
+    - "-C cluster0.has_arm_v8-7=1"
+    - "-C cluster0.has_arm_v8-8=1"
+    - "-C cluster0.has_arm_v8-9=1"
+    - "-C cluster0.has_arm_v9-0=1"
+    - "-C cluster0.has_arm_v9-1=1"
+    - "-C cluster0.has_arm_v9-2=1"
+    - "-C cluster0.has_arm_v9-3=1"
+    - "-C cluster0.has_arm_v9-4=1"
+    - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_branch_target_exception=1"
+    - "-C cluster0.has_brbe=1"
+    - "-C cluster0.has_brbe_v1p1=1"
+    - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_gcs=1"
+    - "-C cluster0.has_hpmn0=1"
+    - "-C cluster0.has_large_system_ext=1"
+    - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
+    - "-C cluster0.has_permission_indirection_s1=1"
+    - "-C cluster0.has_permission_indirection_s2=1"
+    - "-C cluster0.has_permission_overlay_s1=1"
+    - "-C cluster0.has_permission_overlay_s2=1"
+    - "-C cluster0.has_rndr=1"
+    - "-C cluster0.has_sve=1"
+    - "-C cluster0.max_32bit_el=0"
+    - "-C cluster0.pmb_idr_external_abort=1"
+    - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_sme2=1"
+    - "-C cluster0.sve.has_sme=1"
+    - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster1.NUM_CORES=4"
+    - "-C cluster1.PA_SIZE=48"
+    - "-C cluster1.check_memory_attributes=0"
+    - "-C cluster1.clear_reg_top_eret=2"
+    - "-C cluster1.ecv_support_level=2"
+    - "-C cluster1.enhanced_pac2_level=3"
+    - "-C cluster1.gicv3.cpuintf-mmap-access-level=2"
+    - "-C cluster1.gicv3.without-DS-support=1"
+    - "-C cluster1.gicv4.mask-virtual-interrupt=1"
+    - "-C cluster1.has_16k_granule=1"
+    - "-C cluster1.has_amu=1"
+    - "-C cluster1.has_arm_v8-1=1"
+    - "-C cluster1.has_arm_v8-2=1"
+    - "-C cluster1.has_arm_v8-3=1"
+    - "-C cluster1.has_arm_v8-4=1"
+    - "-C cluster1.has_arm_v8-5=1"
+    - "-C cluster1.has_arm_v8-6=1"
+    - "-C cluster1.has_arm_v8-7=1"
+    - "-C cluster1.has_arm_v8-8=1"
+    - "-C cluster1.has_arm_v8-9=1"
+    - "-C cluster1.has_arm_v9-0=1"
+    - "-C cluster1.has_arm_v9-1=1"
+    - "-C cluster1.has_arm_v9-2=1"
+    - "-C cluster1.has_arm_v9-3=1"
+    - "-C cluster1.has_arm_v9-4=1"
+    - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_branch_target_exception=1"
+    - "-C cluster1.has_brbe=1"
+    - "-C cluster1.has_brbe_v1p1=1"
+    - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_gcs=1"
+    - "-C cluster1.has_hpmn0=1"
+    - "-C cluster1.has_large_system_ext=1"
+    - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
+    - "-C cluster1.has_permission_indirection_s1=1"
+    - "-C cluster1.has_permission_indirection_s2=1"
+    - "-C cluster1.has_permission_overlay_s1=1"
+    - "-C cluster1.has_permission_overlay_s2=1"
+    - "-C cluster1.has_rndr=1"
+    - "-C cluster1.has_sve=1"
+    - "-C cluster1.max_32bit_el=0"
+    - "-C cluster1.pmb_idr_external_abort=1"
+    - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_sme2=1"
+    - "-C cluster1.sve.has_sme=1"
+    - "-C cluster1.sve.has_sve2=1"
+    - "-C gic_distributor.has_nmi=1"
+    - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
+    - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
+    - "-C pci.pci_smmuv3.mmu.SMMU_IDR1=216481056"
+    - "-C pci.pci_smmuv3.mmu.SMMU_IDR3=5908"
+    - "-C pci.pci_smmuv3.mmu.SMMU_IDR5=4294902901"
+    - "-C pci.pci_smmuv3.mmu.SMMU_S_IDR1=2684354562"
+    - "-C pci.pci_smmuv3.mmu.SMMU_S_IDR2=0"
+    - "-C pci.pci_smmuv3.mmu.SMMU_S_IDR3=0"
+    - "-C pctl.startup=0.0.0.0"
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - 'root@(.*):[/~]#'
+    - '/ #'
diff --git a/test/unit/refs/definitions/fvp-aemva-defaults.yaml b/test/unit/refs/definitions/fvp-aemva-defaults.yaml
index 99e6352..b053457 100644
--- a/test/unit/refs/definitions/fvp-aemva-defaults.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-defaults.yaml
@@ -39,10 +39,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -103,14 +103,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -120,9 +126,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -149,14 +158,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -166,9 +181,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-enable-cca.yaml b/test/unit/refs/definitions/fvp-aemva-enable-cca.yaml
index 575d84c..e3856c6 100644
--- a/test/unit/refs/definitions/fvp-aemva-enable-cca.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-enable-cca.yaml
@@ -39,10 +39,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -105,14 +105,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -128,9 +134,12 @@ actions:
     - "-C cluster0.output_attributes=ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP"
     - "-C cluster0.brbe_disable_recording=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -157,14 +166,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -180,9 +195,12 @@ actions:
     - "-C cluster1.output_attributes=ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP"
     - "-C cluster1.brbe_disable_recording=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-kernel-xz.yaml b/test/unit/refs/definitions/fvp-aemva-kernel-xz.yaml
index 9ff1ec0..f35c44c 100644
--- a/test/unit/refs/definitions/fvp-aemva-kernel-xz.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-kernel-xz.yaml
@@ -40,10 +40,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -104,14 +104,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -121,9 +127,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -150,14 +159,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -167,9 +182,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-ltp-smoke.yaml b/test/unit/refs/definitions/fvp-aemva-ltp-smoke.yaml
index 1d83e3a..e33a6fe 100644
--- a/test/unit/refs/definitions/fvp-aemva-ltp-smoke.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-ltp-smoke.yaml
@@ -41,10 +41,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -105,14 +105,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -122,9 +128,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -151,14 +160,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -168,9 +183,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-modules-path-usr.yaml b/test/unit/refs/definitions/fvp-aemva-modules-path-usr.yaml
index 7773063..7290dca 100644
--- a/test/unit/refs/definitions/fvp-aemva-modules-path-usr.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-modules-path-usr.yaml
@@ -45,10 +45,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -109,14 +109,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -126,9 +132,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -155,14 +164,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -172,9 +187,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-modules-tar-gz.yaml b/test/unit/refs/definitions/fvp-aemva-modules-tar-gz.yaml
index 64e6f55..2b17297 100644
--- a/test/unit/refs/definitions/fvp-aemva-modules-tar-gz.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-modules-tar-gz.yaml
@@ -45,10 +45,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -109,14 +109,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -126,9 +132,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -155,14 +164,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -172,9 +187,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-modules.yaml b/test/unit/refs/definitions/fvp-aemva-modules.yaml
index 6e7fd7e..8e0a87d 100644
--- a/test/unit/refs/definitions/fvp-aemva-modules.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-modules.yaml
@@ -45,10 +45,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -109,14 +109,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -126,9 +132,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -155,14 +164,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -172,9 +187,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva-prompt.yaml b/test/unit/refs/definitions/fvp-aemva-prompt.yaml
index ecbaaed..38214dc 100644
--- a/test/unit/refs/definitions/fvp-aemva-prompt.yaml
+++ b/test/unit/refs/definitions/fvp-aemva-prompt.yaml
@@ -39,10 +39,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -103,14 +103,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -120,9 +126,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -149,14 +158,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -166,9 +181,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/refs/definitions/fvp-aemva.yaml b/test/unit/refs/definitions/fvp-aemva.yaml
index 2735b2a..5ba2fa0 100644
--- a/test/unit/refs/definitions/fvp-aemva.yaml
+++ b/test/unit/refs/definitions/fvp-aemva.yaml
@@ -39,10 +39,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "tuxlava-ci"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: 10
@@ -103,14 +103,20 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+    - "-C cluster0.has_arm_v9-7=1"
+    - "-C cluster0.has_arm_v9-6=1"
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -120,9 +126,12 @@ actions:
     - "-C cluster0.max_32bit_el=0"
     - "-C cluster0.pmb_idr_external_abort=1"
     - "-C cluster0.stage12_tlb_size=1024"
+    - "-C cluster0.sve.has_b16mm=1"
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -149,14 +158,20 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+    - "-C cluster1.has_arm_v9-7=1"
+    - "-C cluster1.has_arm_v9-6=1"
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -166,9 +181,12 @@ actions:
     - "-C cluster1.max_32bit_el=0"
     - "-C cluster1.pmb_idr_external_abort=1"
     - "-C cluster1.stage12_tlb_size=1024"
+    - "-C cluster1.sve.has_b16mm=1"
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"
diff --git a/test/unit/test_device.py b/test/unit/test_device.py
index 39c42b6..92246e3 100644
--- a/test/unit/test_device.py
+++ b/test/unit/test_device.py
@@ -1568,6 +1568,21 @@ def artefacts(tmp_path):
             ],
             "fvp-aemva-enable-cca.yaml",
         ),
+        (
+            [
+                "--device",
+                "fvp-aemva",
+                "--bl1",
+                "tf-bl1.bin",
+                "--fip",
+                "fip.bin",
+                "--rootfs",
+                "https://example.com/rootfs.ext4.zst",
+                "--parameters",
+                "FVP_ARM_ARCH_VERSION=9.5",
+            ],
+            "fvp-aemva-arch-v95.yaml",
+        ),
         (
             [
                 "--device",
diff --git a/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2 b/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
index 798bbb6..becdfe0 100644
--- a/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
+++ b/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
@@ -8,6 +8,8 @@ visibility: "{{ visibility }}"
 
 {%- set deploy_timeout = timeouts.deploy|default(deploy_timeout) %}
 {%- set boot_timeout = timeouts.boot|default(boot_timeout) %}
+{%- set fvp_arch = parameters.get("FVP_ARM_ARCH_VERSION", "9.7").split(".") %}
+{%- set fvp_arch_version = (fvp_arch[0] | int, fvp_arch[1] | int) %}
 
 timeouts:
   job:
@@ -72,10 +74,10 @@ actions:
 - boot:
     method: fvp
     docker:
-      name: "docker.io/shrinkwraptool/base-slim:2025.12.0"
+      name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "{{ tmpdir.name }}"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: {{ boot_timeout }}
@@ -144,14 +146,26 @@ actions:
     - "-C cluster0.has_arm_v9-3=1"
     - "-C cluster0.has_arm_v9-4=1"
     - "-C cluster0.has_arm_v9-5=1"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster0.has_arm_v9-7=1"
+{% endif %}
+{% if fvp_arch_version >= (9, 6) %}
+    - "-C cluster0.has_arm_v9-6=1"
+{% endif %}
     - "-C cluster0.has_branch_target_exception=1"
     - "-C cluster0.has_brbe=1"
     - "-C cluster0.has_brbe_v1p1=1"
     - "-C cluster0.has_const_pac=1"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster0.has_f16f32dot=1"
+    - "-C cluster0.has_f16f32mm=1"
+    - "-C cluster0.has_f16mm=1"
+{% endif %}
     - "-C cluster0.has_gcs=1"
     - "-C cluster0.has_hpmn0=1"
     - "-C cluster0.has_large_system_ext=1"
     - "-C cluster0.has_large_va=1"
+    - "-C cluster0.has_lsfe=1"
     - "-C cluster0.has_permission_indirection_s1=1"
     - "-C cluster0.has_permission_indirection_s2=1"
     - "-C cluster0.has_permission_overlay_s1=1"
@@ -169,9 +183,19 @@ actions:
     - "-C cluster0.brbe_disable_recording=1"
 {% endif %}
     - "-C cluster0.stage12_tlb_size=1024"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster0.sve.has_b16mm=1"
+{% endif %}
     - "-C cluster0.sve.has_sme2=1"
     - "-C cluster0.sve.has_sme=1"
     - "-C cluster0.sve.has_sve2=1"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster0.sve.sme2_version=3"
+    - "-C cluster0.sve.sve2_version=3"
+{% elif fvp_arch_version >= (9, 6) %}
+    - "-C cluster0.sve.sme2_version=2"
+    - "-C cluster0.sve.sve2_version=2"
+{% endif %}
     - "-C cluster1.NUM_CORES=4"
     - "-C cluster1.PA_SIZE=48"
     - "-C cluster1.check_memory_attributes=0"
@@ -198,14 +222,26 @@ actions:
     - "-C cluster1.has_arm_v9-3=1"
     - "-C cluster1.has_arm_v9-4=1"
     - "-C cluster1.has_arm_v9-5=1"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster1.has_arm_v9-7=1"
+{% endif %}
+{% if fvp_arch_version >= (9, 6) %}
+    - "-C cluster1.has_arm_v9-6=1"
+{% endif %}
     - "-C cluster1.has_branch_target_exception=1"
     - "-C cluster1.has_brbe=1"
     - "-C cluster1.has_brbe_v1p1=1"
     - "-C cluster1.has_const_pac=1"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster1.has_f16f32dot=1"
+    - "-C cluster1.has_f16f32mm=1"
+    - "-C cluster1.has_f16mm=1"
+{% endif %}
     - "-C cluster1.has_gcs=1"
     - "-C cluster1.has_hpmn0=1"
     - "-C cluster1.has_large_system_ext=1"
     - "-C cluster1.has_large_va=1"
+    - "-C cluster1.has_lsfe=1"
     - "-C cluster1.has_permission_indirection_s1=1"
     - "-C cluster1.has_permission_indirection_s2=1"
     - "-C cluster1.has_permission_overlay_s1=1"
@@ -223,9 +259,19 @@ actions:
     - "-C cluster1.brbe_disable_recording=1"
 {% endif %}
     - "-C cluster1.stage12_tlb_size=1024"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster1.sve.has_b16mm=1"
+{% endif %}
     - "-C cluster1.sve.has_sme2=1"
     - "-C cluster1.sve.has_sme=1"
     - "-C cluster1.sve.has_sve2=1"
+{% if fvp_arch_version >= (9, 7) %}
+    - "-C cluster1.sve.sme2_version=3"
+    - "-C cluster1.sve.sve2_version=3"
+{% elif fvp_arch_version >= (9, 6) %}
+    - "-C cluster1.sve.sme2_version=2"
+    - "-C cluster1.sve.sve2_version=2"
+{% endif %}
     - "-C gic_distributor.has_nmi=1"
     - "-C pci.pci_smmuv3.mmu.SMMU_AIDR=2"
     - "-C pci.pci_smmuv3.mmu.SMMU_IDR0=135263935"