diff --git a/ci/fvps.yml b/ci/fvps.yml
index 8f1de177..e736c519 100644
--- a/ci/fvps.yml
+++ b/ci/fvps.yml
@@ -19,8 +19,13 @@ target:
   # Target packages to test aarch64
   - fvp-base-a-aem
   - fvp-corstone1000
+  - fvp-rd1-ae
+  - fvp-v3-r1
   # Nativesdk to test x86-64
   - nativesdk-fvp-base-a-aem
   - nativesdk-fvp-corstone1000
-  - nativesdk-fvp-n1-edge
+  - nativesdk-fvp-rd1-ae
+  - nativesdk-fvp-v3-r1
+  # These are x86 only... :(
   - nativesdk-fvp-sgi575
+  - nativesdk-fvp-tc3
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb
index 8c7e4dc6..f411276b 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba
                     file://license_terms/third_party_licenses/third_party_licenses.txt;md5=c51b57b6a4731881849eb0e2e2b6d799 \
                     file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=abcaafefc7b7a0cdf6664c51f9075c5b"
 
-
 SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
 SRC_URI[fvp-aarch64.sha256sum] = "a380e271f14ce7cf99158018368ac86fe8c305f82c7d332a93eb08bf7a172571"
 SRC_URI[fvp-x86_64.sha256sum] = "0f6d67d834a8ed5dff3c863e0e3545ef39c736405ea8227577ac004cffd66e93"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb b/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb
deleted file mode 100644
index 7fc3949b..00000000
--- a/meta-arm/recipes-devtools/fvp/fvp-n1-edge.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require fvp-ecosystem.inc
-
-MODEL = "Neoverse-N1"
-MODEL_CODE = "FVP_RD_N1_edge"
-PV = "11.17.29"
-
-SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/${MODEL}/${MODEL_CODE}_${PV_URL}_Linux64.tgz;subdir=${BP}"
-SRC_URI[sha256sum] = "76f5d6ec50b64fad6d8d901101d9ae2c62805f50fcfd0edb125bc2c68de8c8f2"
-
-LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
-                    file://license_terms/third_party_licenses.txt;md5=41029e71051b1c786bae3112a29905a7"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
new file mode 100644
index 00000000..56558f83
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-rd1-ae.bb
@@ -0,0 +1,14 @@
+require fvp-ecosystem.inc
+
+MODEL = "RD-1_AE"
+MODEL_CODE = "FVP_RD_1_AE"
+PV = "11.27.20"
+
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Automotive/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
+SRC_URI[fvp-aarch64.sha256sum] = "297ded55d025772c9ad8497c6a97e0619fc1762dd1236e3ddec14da449f51ca4"
+SRC_URI[fvp-x86_64.sha256sum] = "e2b01fafac9cd560ed7a42f155241971d0cef086404c56bbb44dc6c9bf672e7d"
+
+LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
+                    file://license_terms/third_party_licenses/third_party_licenses.txt;md5=a3ce84371977a6b9c624408238309a90"
+
+COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc3.bb b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
new file mode 100644
index 00000000..e63a848a
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-tc3.bb
@@ -0,0 +1,11 @@
+require fvp-ecosystem.inc
+
+MODEL = "TC3"
+MODEL_CODE = "FVP_TC3"
+PV = "11.26.16"
+
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Total-Compute/Total-Compute-TC3/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP}"
+SRC_URI[sha256sum] = "1d72b508e5d8b50de0e389140b4930e5de53c48ba0d3e0865ed4d15898610069"
+
+LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
+                    file://license_terms/third_party_licenses/third_party_licenses.txt;md5=58b552b918d097a8ba802168312d76b2"
diff --git a/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb b/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb
new file mode 100644
index 00000000..5a451eff
--- /dev/null
+++ b/meta-arm/recipes-devtools/fvp/fvp-v3-r1.bb
@@ -0,0 +1,14 @@
+require fvp-ecosystem.inc
+
+MODEL = "RD-V3-r1"
+MODEL_CODE = "FVP_RD_V3_R1"
+PV = "11.27.51"
+
+SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Neoverse-Infrastructure/${MODEL}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}"
+SRC_URI[fvp-aarch64.sha256sum] = "6b25961a7dcac99ff5d2c63f297e1598b05e67938d71353b37c82e3d58d7ac3c"
+SRC_URI[fvp-x86_64.sha256sum] = "72f659ee3554ab0330984f35b2d640ea6553bbcbbf77cc485555be14277e4bc3"
+
+LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
+                    file://license_terms/third_party_licenses/third_party_licenses.txt;md5=9ddd501715f7e1fed82c57b260b020ba"
+
+COMPATIBLE_HOST = "(aarch64|x86_64).*-linux"