diff --git a/tests/framework/utils_cpu_templates.py b/tests/framework/utils_cpu_templates.py
index 5badd7c640a..96bf197efda 100644
--- a/tests/framework/utils_cpu_templates.py
+++ b/tests/framework/utils_cpu_templates.py
@@ -42,18 +42,12 @@ def get_supported_cpu_templates():
 
 SUPPORTED_CPU_TEMPLATES = get_supported_cpu_templates()
 
-# Custom CPU templates for Aarch64 for testing
-AARCH64_CUSTOM_CPU_TEMPLATES_G2 = ["v1n1"]
-AARCH64_CUSTOM_CPU_TEMPLATES_G3 = [
-    "aarch64_with_sve_and_pac",
-    "v1n1",
-]
-
 
 def get_supported_custom_cpu_templates():
     """
     Return the list of custom CPU templates supported by the platform.
     """
+    # pylint:disable=too-many-return-statements
     host_linux = global_props.host_linux_version_tpl
 
     match get_cpu_vendor(), global_props.cpu_codename:
@@ -65,9 +59,11 @@ def get_supported_custom_cpu_templates():
         case CpuVendor.AMD, _:
             return AMD_TEMPLATES
         case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_N1 if host_linux >= (6, 1):
-            return AARCH64_CUSTOM_CPU_TEMPLATES_G2
+            return ["v1n1"]
         case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V1 if host_linux >= (6, 1):
-            return AARCH64_CUSTOM_CPU_TEMPLATES_G3
+            return ["v1n1", "aarch64_with_sve_and_pac"]
+        case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V1:
+            return ["aarch64_with_sve_and_pac"]
         case _:
             return []