diff --git a/cheribsd.yaml b/cheribsd.yaml
index d9a7264..fdb07bc 100644
--- a/cheribsd.yaml
+++ b/cheribsd.yaml
@@ -17,7 +17,7 @@ project_contribution:
 
     Portions of CheriBSD are being posted for upstreaming in a fork of [FreeBSD hosted at the CHERI Alliance](https://github.com/CHERI-Alliance/freebsd-src). This primarily exists for staging purposes and is not currently capable of producing a usable CHERI system, but can be used to examine patches in progress and validate them on non-CHERI targets.  The cheri branch is a rebased branch and may be unstable at times.  Snapshot are posted occasionally.  The latest snaphost is [2025.03.02](https://github.com/CHERI-Alliance/freebsd-src/releases/tag/cheri-2026.03.02).
   mailing_lists: |-
-    The following lists should be used: 
+    The following lists should be used:
       - [CheriBSD announcement mailing list (low volume)](https://lists.cam.ac.uk/sympa/info/cl-cheribsd-announce)
       - [CheriBSD general discussion](https://lists.cam.ac.uk/sympa/info/cl-cheribsd-discuss)
       - [CheriBSD ports and packages discussion](https://lists.cam.ac.uk/sympa/info/cl-cheribsd-ports)
@@ -33,7 +33,7 @@ project_contribution:
 buildingFromSource: "Please keep an eye out for our [blog](/blog/) as we will soon share instructions for building from source."
 
 software:
-  - arch: "aarch64c"
+  - arch: "riscv64c, aarch64c"
     releases:
      - version: "25.03"
        version_date: 2025-03-28
@@ -42,6 +42,11 @@ software:
        upstream_version: "15-CURRENT (1500026)"
        upstream_date: 2024-10-26
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-25.03.img.xz"
@@ -50,13 +55,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/25.03/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "24.05"
        version_date: 2024-07-19
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F24.05"
        upstream_version: "15-CURRENT (1500011)"
        upstream_date: 2024-01-20
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/4b3ffc5918b9968ea6ddee6f6cdf3538072e5ef4"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-24.05.img.xz"
@@ -65,13 +75,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/24.05/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "23.11"
        version_date: 2023-12-12
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F23.11"
        upstream_version: "14-CURRENT (1400094)"
        upstream_date: 2023-08-18
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/d8bb58586d90a27852cc79f37aa890ac6397cc03"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-23.11.img.xz"
@@ -80,13 +95,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/23.11/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "22.12"
        version_date: 2022-12-14
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F22.12"
        upstream_version: "14-CURRENT (1400064)"
        upstream_date: 2022-07-29
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/43eebd036447f5399dd4bfa9b9d3e4e6f6596f48"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-22.12.img.xz"
@@ -95,13 +115,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/22.12/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "22.05p1"
        version_date: 2022-07-05
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F22.05p1"
        upstream_version: "14-CURRENT (1400053)"
        upstream_date: 2022-03-04
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/25375b1415f8a0b0290b56c00c31d20e218ffab9"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-22.05p1.img.xz"
@@ -110,13 +135,18 @@ software:
            link: "https://www.cheribsd.org/release-notes/22.05p1/index.html"
          - label: "Installation Guide"
            link: "https://ctsrd-cheri.github.io/cheribsd-getting-started/morello-install/index.html"
-     - arch: "aarch64c"
+     - arch: "riscv64c, aarch64c"
        version: "22.05"
        version_date: 2022-05-23
        version_url: "https://github.com/CTSRD-CHERI/cheribsd/releases/tag/release%2F22.05"
        upstream_version: "14-CURRENT (1400053)"
        upstream_date: 2022-03-04
        upstream_url: "https://github.com/freebsd/freebsd-src/commit/25375b1415f8a0b0290b56c00c31d20e218ffab9"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Installer Image"
            link: "https://download.cheribsd.org/releases/arm64/aarch64c/25.03/cheribsd-memstick-arm64-aarch64c-22.05.img.xz"
diff --git a/cheriot.yaml b/cheriot.yaml
index 8900d2b..40d2b5c 100644
--- a/cheriot.yaml
+++ b/cheriot.yaml
@@ -1,7 +1,7 @@
 project_summary:
   category: "rtos"
   home_url: "https://cheriot.org/"
-  # home_text: 
+  # home_text:
   short_description: "The core RTOS for the CHERIoT platform"
   description: |-
     [CHERIoT-RTOS](https://github.com/CHERIoT-Platform/cheriot-rtos) is a real-time operating system implementation, designed to make full use of CHERIoT ISA architecture.
@@ -12,13 +12,13 @@ project_summary:
     MMUs also typically need page tables, which are very large on resource-constrained systems.
     Embedded systems often have a memory-protection unit (MPU) instead, which provides access control to a fixed number of regions.
     CHERIoT was designed assuming CHERI from the ground up and so does not require either: it can use CHERI for object-granularity protection and safe sharing, without needing additional look-aside structures.
-    
+
     The full CHERIoT platform consists of three major components:
     - [The CHERIoT ISA](https://github.com/CHERIoT-Platform/cheriot-sail) - Extends the RISC-V ISA with a core CHERI implementation suitable for small-scale embedded devices.
       This has two open-source implementations:
       - [CHERIoT Ibex](https://github.com/microsoft/cheriot-ibex) is a mature production-quality (area-optimised) reference implementation.
       - [CHERIoT Kudu](https://github.com/microsoft/cheriot-kudu) is a newer higher-performance dual-issue implementation.
-      
+
       The first CHERIoT devices are expected to be available in quantity in 2026.
     - [CHERIoT-LLVM](https://github.com/CHERIoT-Platform/llvm-project) - Compiler toolchain targeting CHERIoT.
     - [CHERIoT-RTOS](https://github.com/CHERIoT-Platform/cheriot-rtos) - The core of the system.
@@ -30,10 +30,10 @@ project_summary:
     Track the current progress towards a 1.0 release on their [GitHub](https://github.com/orgs/CHERIoT-Platform/projects/2).
 
     You can keep up to date the with latest news for CHERIoT Platform via the project [website](https://cheriot.org/news.html) and via their [public Signal chat](https://signal.group/#CjQKIElxAs3t3MUEMOEmQEuMHRK4rErUk2xVeFzjAjFXAShzEhCK9qQwEMFKGLGZnCjrQ7zm).
-       
+
   #vulnerability_contact: N/A There is no coordinated vulnerability disclosure for this project.
   #download_notes: N/A - No extra notes needed there is the devcontainer that is an equivalent to a pre-built binary really
-  last_update: "29th January 2026" 
+  last_update: "29th January 2026"
 
 project_contribution:
   src_tree: |-
@@ -53,21 +53,23 @@ project_contribution:
 
 buildingFromSource: |-
   CHERIoT-RTOS provides a development environment container which includes all of the necessary dependencies pre-built to allow you to quickly begin development of CHERIoT-RTOS applications, without the need to build LLVM and the Sail-based emulator first.
-  
-  If you're looking to quickly get started developing with CHERIoT-RTOS, we recommend using the devcontainer. 
-  
+
+  If you're looking to quickly get started developing with CHERIoT-RTOS, we recommend using the devcontainer.
+
   Their [Getting Started guide](https://github.com/CHERIoT-Platform/cheriot-rtos/blob/main/docs/GettingStarted.md) covers setting this up, as well as building dependencies from source.
 
 software:
 
-  - arch: "CHERIoT"
+  - arch: "riscv32cheriot"
     releases:
       - version: "HEAD"
         version_date: 2026-01-06
         version_url: "https://github.com/CHERIoT-Platform/cheriot-rtos/"
         latest: true
-        cheri_spec: CHERIoT ISA v1.0
-        images: 
+        cheri_spec:
+          - name: CHERIoT
+            version: ISA v1.0
+        images:
           - label: "Source (incl devcontainer)"
             link: "https://github.com/CHERIoT-Platform/cheriot-rtos/"
         docs:
diff --git a/cheriyocto.yaml b/cheriyocto.yaml
index d5bd150..a4d0be3 100644
--- a/cheriyocto.yaml
+++ b/cheriyocto.yaml
@@ -18,10 +18,10 @@ project_contribution:
 
     The layer can be used with its sister distro layer [meta-morello-distro](https://github.com/The-Capable-Hub/meta-morello-distro) that provides CHERIfied user space applications.
   mailing_lists: |-
-    The following lists should be used: 
+    The following lists should be used:
       - [Original ARM Morello mailing list](https://op-lists.linaro.org/mailman3/lists/linux-morello-distros.op-lists.linaro.org)
   slack: |-
-    Support for meta-morello is provided via the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html), please post your questions under the #cheri-linux channel. 
+    Support for meta-morello is provided via the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html), please post your questions under the #cheri-linux channel.
   meetings: |-
     There are no public meetings for this project.
 
@@ -37,6 +37,9 @@ software:
        upstream_version: "5.0.16 Scarthgap LTS"
        upstream_date: 2026-02-16
        upstream_url: "https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.16/poky-1d54d1c4736a114e1cecbe85a0306e3814d5ce70.tar.bz2"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Board firmware"
            link: "https://yocto-morello.dl.thecapablehub.org/morello-release-2.0/board-firmware-sd-image.img"
@@ -48,6 +51,9 @@ software:
        upstream_version: "4.0.32 Kikrstone LTS"
        upstream_date: 2025-12-24
        upstream_url: "https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.32/poky-2c05660b21c7cc1082aeac8b75d8a2d82e249f63.tar.bz2"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Board firmware"
            link: "https://yocto-morello.dl.thecapablehub.org/morello-release-1.9/board-firmware-sd-image.img"
diff --git a/cherizephyr.yaml b/cherizephyr.yaml
index 8a60c33..2801353 100644
--- a/cherizephyr.yaml
+++ b/cherizephyr.yaml
@@ -30,6 +30,9 @@ software:
        upstream_version: "4.1.0"
        upstream_date: 2025-05-20
        upstream_url: "https://github.com/CHERI-Alliance/CHERI-zephyr/commit/90a48e814b9699d34d41e42038bef0132427a5c3"
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/CHERI-zephyr/tree/v0.3.0-cheri-branch"
@@ -46,6 +49,9 @@ software:
        upstream_version: "4.1.0"
        upstream_date: 2025-05-20
        upstream_url: "https://github.com/CHERI-Alliance/CHERI-zephyr/commit/90a48e814b9699d34d41e42038bef0132427a5c3"
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/CHERI-zephyr/tree/CHERI-Zephyr-v0.2.0"
@@ -59,6 +65,9 @@ software:
        upstream_version: "3.5.0"
        upstream_date: 2023-11-07
        upstream_url: "https://github.com/CHERI-Alliance/CHERI-zephyr/commit/ec031029f4cab3c0fbb116f5cd63afcf59205a84"
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/CHERI-zephyr/tree/CHERI-Zephyr-v0.1.0"
diff --git a/gcc.yaml b/gcc.yaml
index 8e87e85..24e0437 100644
--- a/gcc.yaml
+++ b/gcc.yaml
@@ -5,17 +5,17 @@ project_summary:
   description: |-
     GCC is a open-source compiler collection used to compile a vast amount of existing software for different processor architectures.
     For CHERI, this enables legacy applications to be recompiled to utilise hardware capabilities, enforcing memory safety and pointer validity at the instruction level.
-    
+
   status: |-
     There have been no releases of Morello GNU toolchain in a long time. It is currently unmaintained and lagging considerably behind upstream.
-    
+
   #vulnerability_contact: "support@thecapablehub.org"
   download_notes: "There are no pre-built binaries or versioned releases yet, users must build from source."
   last_update: "30th January 2026"
 
 project_contribution:
   src_tree: |-
-    - [morello/gnu-toolchain/gcc](https://git.morello-project.org/morello/gnu-toolchain/gcc) 
+    - [morello/gnu-toolchain/gcc](https://git.morello-project.org/morello/gnu-toolchain/gcc)
   chat: |-
     Use the [Morello forum](https://community.arm.com/support-forums/f/morello-forum) for general support.
   mailing_lists: |-
@@ -34,11 +34,13 @@ software:
         version_date: 2022-11-30
         version_url: "https://developer.arm.com/Tools%20and%20Software/Morello%20Development%20Tools#Downloads"
         latest: true
-        cheri_spec: Morello
         upstream_version: "10.1.0"
         upstream_date: 2020-05-07
         upstream_url: "https://gcc.gnu.org/git/?p=gcc.git;a=tag;h=refs/tags/releases/gcc-10.1.0"
-        images: 
+        cheri_spec:
+          - name: ARM Morello
+            version: A.k
+        images:
           - label: "bare-metal (aarch64 host)"
             link: "https://developer.arm.com/-/cdn-downloads/permalink/Arm-GNU-Toolchain-Morello/10.1.Morello-Alp2_Linux/arm-gnu-toolchain-10.1.morello-alp2-aarch64-aarch64-none-elf.tar.xz"
           - label: "linux (aarch64 host)"
@@ -50,17 +52,19 @@ software:
         docs:
           - label: "Release Notes"
             link: "https://developer.arm.com/documentation/109399/10-1-Morello-Alp2-2022_11/"
-  - arch: "bare-metal/aarch64c"  
-    releases:  
+  - arch: "bare-metal/aarch64c"
+    releases:
       - version: "10.1.Morello-Alp1_Linux"
         version_date: 2022-06-13
         version_url: "https://developer.arm.com/Tools%20and%20Software/Morello%20Development%20Tools#Downloads"
         latest: false
-        cheri_spec: Morello
         upstream_version: "10.1.0"
         upstream_date: 2020-05-07
         upstream_url: "https://gcc.gnu.org/git/?p=gcc.git;a=tag;h=refs/tags/releases/gcc-10.1.0"
-        images: 
+        cheri_spec:
+          - name: ARM Morello
+            version: A.k
+        images:
           - label: "bare-metal (aarch64 host)"
             link: "https://developer.arm.com/-/cdn-downloads/permalink/Arm-GNU-Toolchain-Morello/10.1.Morello-Alp1_Linux/arm-gnu-toolchain-10.1.Morello-Alp1-aarch64-aarch64-none-elf.tar.xz"
           - label: "bare-metal (x86_64 host)"
diff --git a/gdb.yaml b/gdb.yaml
index 8fc5ccb..864eb96 100644
--- a/gdb.yaml
+++ b/gdb.yaml
@@ -2,11 +2,11 @@ project_summary:
   category: "tools"
   home_text: "_There are multiple homes for this project, see the [Get Involved](#get-involved) section._"
   short_description: "CHERI-enabled fork of GDB"
-  description: |- 
+  description: |-
     [GNU Debuger](https://www.sourceware.org/gdb/) is a portable debug utility that can run/attach to other processes and inspect but also control how these processes (and their children) are accessing the system memory and how the code ends up in and interacts with the hardware registers. The tool can understand assembly and higher level languages and in general is very good for tracing application execution in real time.
 
   status: |-
-    There are three repositories for GDB, each historically adding support for different architectures, the first development work was done for the University of Cambridge RISC-V architecture (currently at ISAv9) at  [https://github.com/CTSRD-CHERI/gdb](https://github.com/CTSRD-CHERI/gdb) and is currently at version 14.1 of GDB.    
+    There are three repositories for GDB, each historically adding support for different architectures, the first development work was done for the University of Cambridge RISC-V architecture (currently at ISAv9) at  [https://github.com/CTSRD-CHERI/gdb](https://github.com/CTSRD-CHERI/gdb) and is currently at version 14.1 of GDB.
     The `cheri-14` branch supports RISC-V ISAv9 userspace CheriBSD and bare-metal binaries and Morello user space for bare-metal, CheriBSD and Linux. The `cheri-14-kgdb` branch also supports CheriBSD kernel for both RISC-V and Morello. This repository replaced the initial and canonical GBD Morello from ARM which is now very old (version 11.0.5).
 
     The GDB for Morello at [https://git.morello-project.org/morello/binutils-gdb](https://git.morello-project.org/morello/binutils-gdb) lives in a vendor branch [upstream](https://sourceware.org/git/?p=binutils-gdb.git;a=shortlog;h=refs/heads/users/ARM/morello-binutils-gdb-master) and as already mentioned is at version 11.0.5, this project was based of an older implementation of GDB from the CTSRD-CHERI repository.
@@ -16,11 +16,11 @@ project_summary:
 
   vulnerability_contact: "support@thecapablehub.org"
   download_notes: "There are no pre-built binaries or versioned releases, users must build from source."
-  last_update: "2nd February 2026" 
+  last_update: "2nd February 2026"
 
 project_contribution:
   src_tree: |-
-    - [CHERI-Alliance/gdb](https://github.com/CHERI-Alliance/gdb) - 14.1 
+    - [CHERI-Alliance/gdb](https://github.com/CHERI-Alliance/gdb) - 14.1
     - [CTSRD-CHERI/gdb](https://github.com/CTSRD-CHERI/gdb) - 14.1
     - [Morello](https://git.morello-project.org/morello/binutils-gdb) - 11.0.5
   chat: |-
@@ -33,45 +33,52 @@ project_contribution:
 buildingFromSource: "Please keep an eye out for our [blog](/blog/) as we will soon share instructions for building from source."
 
 software:
-
   - arch: "riscv64c, aarch64c"
     releases:
-     - version: "df929d4 (codasip-cheri-riscv)"
-       version_date: 2025-18-02
-       version_url: "https://github.com/CHERI-Alliance/gdb/commit/df929d4d218df826242fc297a69049a7e9462e1f"
+     - version: "a686ecf (cheri-14)"
+       version_date: 2025-11-05
+       version_url: "https://github.com/CTSRD-CHERI/gdb/commit/a686ecf4aeedc6fe776a2194aa70f8c2751c3801"
        latest: true
-       cheri_spec: CHERI RISC-V RVY
        upstream_version: "v14.1"
        upstream_date: 2023-12-03
        upstream_url: "https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=6bda1c19bcd16eff8488facb8a67d52a436f70e7"
-       images: 
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        - name: "ARM Morello"
+          version: "A.k"
+       images:
          - label: "Source"
-           link: "https://github.com/CHERI-Alliance/gdb/commit/df929d4d218df826242fc297a69049a7e9462e1f"
-
+           link: "https://github.com/CTSRD-CHERI/gdb/commit/a686ecf4aeedc6fe776a2194aa70f8c2751c3801"
   - arch: "riscv64c, aarch64c"
     releases:
-     - version: "a686ecf (cheri-14)"
-       version_date: 2025-11-05
-       version_url: "https://github.com/CTSRD-CHERI/gdb/commit/a686ecf4aeedc6fe776a2194aa70f8c2751c3801"
+     - version: "df929d4 (codasip-cheri-riscv)"
+       version_date: 2025-02-18
+       version_url: "https://github.com/CHERI-Alliance/gdb/commit/df929d4d218df826242fc297a69049a7e9462e1f"
        latest: true
-       cheri_spec: CHERI RISC-V ISAv9, Morello
        upstream_version: "v14.1"
        upstream_date: 2023-12-03
        upstream_url: "https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=6bda1c19bcd16eff8488facb8a67d52a436f70e7"
-       images: 
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        - name: ARM Morello
+          version: A.k
+       images:
          - label: "Source"
-           link: "https://github.com/CTSRD-CHERI/gdb/commit/a686ecf4aeedc6fe776a2194aa70f8c2751c3801"
-
+           link: "https://github.com/CHERI-Alliance/gdb/commit/df929d4d218df826242fc297a69049a7e9462e1f"
   - arch: "aarch64c"
     releases:
      - version: "70d0d9f0 (morello-binutils-gdb-master)"
        version_date: 2023-12-06
        version_url: "https://git.morello-project.org/morello/binutils-gdb/-/commit/70d0d9f04a51b8c441334f42cd5dfb1f9215be53"
        latest: true
-       cheri_spec: Morello
        upstream_version: "v11.0.5"
        upstream_date: 2020-10-20
        upstream_url: "https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ae86f581c2ac33fc289eb4ac62c0539a7e9c6793"
-       images: 
+       cheri_spec:
+        - name: ARM Morello
+          version: "A.k"
+       images:
          - label: "Source"
-           link: "https://git.morello-project.org/morello/binutils-gdb/-/commit/70d0d9f04a51b8c441334f42cd5dfb1f9215be53"
\ No newline at end of file
+           link: "https://git.morello-project.org/morello/binutils-gdb/-/commit/70d0d9f04a51b8c441334f42cd5dfb1f9215be53"
diff --git a/glibc.yaml b/glibc.yaml
index ed26d91..0ec871b 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -3,14 +3,14 @@ project_summary:
   home_url: "https://developer.arm.com/documentation/109399/10-1-Morello-Alp2-2022_11/"
   short_description: "CHERI-enabled forks of glibc"
   description: |-
-    The GNU C Library (glibc), is the GNU Project implementation of the C standard library. 
+    The GNU C Library (glibc), is the GNU Project implementation of the C standard library.
     It provides a wrapper around the system calls of kernels for application use.
   status: |-
     There have been no releases of Morello GNU toolchain (incl glibc) in a long time. It is currently unmaintained and lagging behind upstream.
 
     There were some updates to the [Morello glibc branch](https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/arm/morello/main) in 2023 but these are not included in any official releases.
 
-  last_update: "3rd February 2026" 
+  last_update: "3rd February 2026"
 
 project_contribution:
   src_tree: |-
@@ -24,7 +24,7 @@ project_contribution:
 
 buildingFromSource: |-
   Instructions on building glibc from source can be found in the [Morello GNU toolchain docs](https://sdk.morello-project.org/docs/gnu/) as well as the Release Notes for each release.
-  
+
 software:
   - arch: "aarch64c"
     releases:
@@ -32,11 +32,13 @@ software:
         version_date: 2022-11-30
         version_url: "https://developer.arm.com/Tools%20and%20Software/Morello%20Development%20Tools#Downloads"
         latest: true
-        cheri_spec: Morello
         upstream_version: "2.36"
         upstream_date: 2022-11-17
         upstream_url: "https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/arm/morello/main"
-        images: 
+        cheri_spec:
+          - name: ARM Morello
+            version: A.k
+        images:
           - label: "linux (aarch64 host)"
             link: "https://developer.arm.com/-/cdn-downloads/permalink/Arm-GNU-Toolchain-Morello/10.1.Morello-Alp2_Linux/arm-gnu-toolchain-10.1.morello-alp2-aarch64-aarch64-none-linux-gnu.tar.xz"
           - label: "linux (x86_64 host)"
diff --git a/linux.yaml b/linux.yaml
index cd7b135..60033c5 100644
--- a/linux.yaml
+++ b/linux.yaml
@@ -3,14 +3,14 @@ project_summary:
   home_url: https://github.com/CHERI-Alliance/linux/
   # home_text: This can be used to provide text if there isn't one home.
   short_description: "CHERI enabled Linux kernel"
-  description: |- 
+  description: |-
     Linux is a free, open-source kernel that serves as the core foundation for a wide variety of operating systems used on everything from servers to smartphones.
     The CHERI forks enhance this foundation by replacing traditional pointers with hardware-enforced capabilities, providing fine-grained memory safety and compartmentalisation.
   status: |-
     Towards the end of 2025, RISC-V support for CHERI Linux by Codasip was open-sourced and published via [CHERI-Alliance/linux](github.com/CHERI-Alliance/linux/) repo.
     These patches are based on the upstream [Linux Kernel](https://github.com/torvalds/linux/), and the CHERI modifications made by the [ARM Morello project](https://git.morello-project.org/morello/kernel/linux).
 
-    The CHERI-enabled RISC-V kernel uses the CHERI enabled purecap UABI and the kernel itself also runs in capability mode. 
+    The CHERI-enabled RISC-V kernel uses the CHERI enabled purecap UABI and the kernel itself also runs in capability mode.
     Support for legacy non-CHERI aware userspace programs is currently incomplete (some driver ioctls are still missing), but running some unmodified binaries is possible as of 6.18.
 
     The code is under continued active development and the history is not guaranteed. Please expect rebases and history re-writes.
@@ -27,7 +27,7 @@ project_contribution:
     - [linux-kernel](https://lists.cheri-alliance.org/mailman3/postorius/lists/linux-kernel.cheri-alliance.org/) CHERI Alliance working group mailing list
   slack: |-
     Support for CHERI Linux is provided via the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html).
-      - #cheri-linux: The main channel for linux 
+      - #cheri-linux: The main channel for linux
   meetings: |-
     The CHERI Alliance [Linux working group](https://cheri-alliance.org/who-we-are/working-groups/cheri-linux/) hold regular meetings
 
@@ -47,10 +47,17 @@ software:
        upstream_version: "6.18"
        upstream_date: 2025-11-30
        upstream_url: "https://github.com/torvalds/linux/commit/7d0a66e4bb9081d75c82ec4957c50034cb0ea449"
-       cheri_spec: CHERI RISC-V Draft 0.9.3
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/linux/tree/codasip-cheri-riscv-6.18"
+       docs:
+        - label: README
+          link: https://github.com/CHERI-Alliance/linux/blob/codasip-cheri-riscv-6.18/README.md
+        - label: TODO
+          link: https://github.com/CHERI-Alliance/linux/blob/codasip-cheri-riscv-6.18/TODO
 
   # Morello Master
   - arch: "aarch64, aarch64c"
@@ -62,7 +69,9 @@ software:
        upstream_version: "6.7"
        upstream_date: 2024-01-07
        upstream_url: "https://github.com/torvalds/linux/commit/0dd3ee31125508cd67f7e7172247f05b7fd1753a"
-       cheri_spec: "ARM Morello"
+       cheri_spec:
+          - name: "ARM Morello"
+            version: "A.k"
        images:
          - label: "Source"
            link: "https://git.morello-project.org/morello/llvm-project-releases/-/archive/morello/linux-aarch64-release-1.9/llvm-project-releases-morello-linux-aarch64-release-1.9.tar.gz"
@@ -79,7 +88,9 @@ software:
        upstream_version: "6.7"
        upstream_date: 2024-01-07
        upstream_url: "https://github.com/torvalds/linux/commit/0dd3ee31125508cd67f7e7172247f05b7fd1753a"
-       cheri_spec: "ARM Morello"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Source"
            link: "https://git.morello-project.org/morello/kernel/linux/-/commits/morello-release-1.8.1?ref_type=tags"
diff --git a/llvm.yaml b/llvm.yaml
index 7c279d4..e008130 100644
--- a/llvm.yaml
+++ b/llvm.yaml
@@ -3,7 +3,7 @@ project_summary:
   # home_url: Omitted as there are multiple. Using home_text instead
   home_text: "_There are multiple homes, see the [Get Involved](#get-involved) section for more info._"
   short_description: "Fork of LLVM adding CHERI support "
-  description: |- 
+  description: |-
     LLVM is a collection of modular and reusable compiler and toolchain technologies.
     These forks integrate CHERI support into LLVM (e.g `clang` and `lld`), enabling the creation of memory-safe software for Morello and RISC-V architectures.
   status: |-
@@ -21,10 +21,10 @@ project_summary:
     The University of Cambridge [CTSRD-CHERI/llvm-project](https://github.com/CTSRD-CHERI/llvm-project) supports the ISAv9 reference spec and contains a lot of the history relating to the development in different branches.
 
     The CHERI Alliance [CHERI-Alliance/llvm-project](https://github.com/CHERI-Alliance/llvm-project) has branches that mirror the work Codasip is doing to increase the LLVM version towards the upstream version (currently what will be LLVM 23).
-    Hence LLVM18 and LLVM19 branches, with LLVM20 due in the near future. 
+    Hence LLVM18 and LLVM19 branches, with LLVM20 due in the near future.
     This work started originally from the Cambridge LLVM15 CHERI compiler but also supports the draft CHERI-RISC-V standard 0.9.3
 
-    There are already shared features and patches between the versions, with an aim to converge these in future (and with the CHERIoT work) to support upstreaming. 
+    There are already shared features and patches between the versions, with an aim to converge these in future (and with the CHERIoT work) to support upstreaming.
     With [CTSRD-CHERI/llvm-project](https://github.com/CTSRD-CHERI/llvm-project) being retained for research.
 
   # vulnerability_contact: "support@thecapablehub.org"
@@ -41,13 +41,13 @@ project_contribution:
     There is no direct LLVM mailing list.
   slack: |-
     Support for CHERI LLVM is provided via the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html).
-      - #cheri-llvm: The main channel for llvm 
+      - #cheri-llvm: The main channel for llvm
   meetings: |-
     There are no public meetings for this project
 
 buildingFromSource: |-
   Instructions for building from source depend on which reference specification you are targeting.
-  
+
   CTSRD and Morello versions are built using the [`cheribuild.py`](https://github.com/CTSRD-CHERI/cheribuild) script.
   Please refer to the [cheribuild](https://github.com/CTSRD-CHERI/cheribuild) repo for usage.
 
@@ -57,20 +57,23 @@ buildingFromSource: |-
   Instructions on building CHERIoT LLVM can be found in their [Getting Started Guide](https://github.com/CHERIoT-Platform/cheriot-rtos/blob/main/docs/GettingStarted.md#building-cheriot-llvm).
 
 software:
-
+  - arch: "riscv32cheriot"
+    releases:
+    - version: "6ec39b3"
+      version_date: 2026-01-22
+      version_url: "https://github.com/CHERIoT-Platform/llvm-project/commit/6ec39b37369d8810f958ef9e2cf74781aa176f72"
+      latest: true
+      upstream_version: "21.1.8"
+      upstream_date: 2025-12-16
+      upstream_url: "https://github.com/llvm/llvm-project/releases/tag/llvmorg-21.1.8"
+      cheri_spec:
+        - name: CHERIoT
+          version: ISA v1.0
+      images:
+        - label: "Source"
+          link: "https://github.com/CHERIoT-Platform/llvm-project"
   - arch: "riscv64c"
     releases:
-     - version: "74d200f (master)"
-       version_date: 2025-10-20
-       latest: true
-       version_url: "https://github.com/CTSRD-CHERI/llvm-project/commit/74d200f2bb65b06633ca87f86b1b9145ebf63a46"
-       upstream_version: "17"
-       upstream_date: 2023-07-25
-       upstream_url: "https://github.com/llvm/llvm-project/commit/d0b54bb50e5110a004b41fc06dadf3fee70834b7"
-       cheri_spec: University of Cambridge RISC-V ISAv9
-       images:
-         - label: "Source"
-           link: "https://github.com/CTSRD-CHERI/llvm-project/tree/74d200f2bb65b06633ca87f86b1b9145ebf63a46"
      - version: "a2ac247 (codasip-cheri-riscv-19)"
        version_date: 2025-12-03
        latest: true
@@ -78,25 +81,26 @@ software:
        upstream_version: "19"
        upstream_date: 2024-07-23
        upstream_url: "https://github.com/llvm/llvm-project/commit/8f701b5df0adb3a2960d78ca2ad9cf53f39ba2fe"
-       cheri_spec: CHERI RISC-V Draft 0.9.3
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
        images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/llvm-project/tree/a2ac247413e163c49d60b8a111a67b65351b2510"
+     - version: "74d200f (master)"
+       version_date: 2025-10-20
+       latest: true
+       version_url: "https://github.com/CTSRD-CHERI/llvm-project/commit/74d200f2bb65b06633ca87f86b1b9145ebf63a46"
+       upstream_version: "17"
+       upstream_date: 2023-07-25
+       upstream_url: "https://github.com/llvm/llvm-project/commit/d0b54bb50e5110a004b41fc06dadf3fee70834b7"
+       cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+       images:
+         - label: "Source"
+           link: "https://github.com/CTSRD-CHERI/llvm-project/tree/74d200f2bb65b06633ca87f86b1b9145ebf63a46"
 
-  - arch: "CHERIoT"
-    releases:
-    - version: "6ec39b3"
-      version_date: 2026-01-22
-      version_url: "https://github.com/CHERIoT-Platform/llvm-project/commit/6ec39b37369d8810f958ef9e2cf74781aa176f72"
-      latest: true
-      upstream_version: "21.1.8"
-      upstream_date: 2025-12-16
-      upstream_url: "https://github.com/llvm/llvm-project/releases/tag/llvmorg-21.1.8"
-      cheri_spec: "CHERIoT 1.0"
-      images:
-        - label: "Source"
-          link: "https://github.com/CHERIoT-Platform/llvm-project"
-          
   # Older Releases
   - arch: "aarch64c"
     releases:
@@ -107,7 +111,9 @@ software:
        upstream_version: "17"
        upstream_date: 2024-10-26
        upstream_url: "https://github.com/llvm/llvm-project.git/commit/d0b54bb50e5110a004b41fc06dadf3fee70834b7"
-       cheri_spec: "ARM Morello"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "Source"
            link: "https://git.morello-project.org/morello/llvm-project/tree/morello/dev"
@@ -119,7 +125,9 @@ software:
        upstream_version: "15"
        upstream_date: 2022-07-26
        upstream_url: "https://github.com/llvm/llvm-project.git/commit/1f8ae9d7e7e4afcc4e76728b28e64941660ca3eb"
-       cheri_spec: "ARM Morello"
+       cheri_spec:
+        - name: "ARM Morello"
+          version: A.k
        images:
          - label: "linux/aarch64c"
            link: "https://git.morello-project.org/morello/llvm-project-releases/-/archive/morello/linux-aarch64-release-1.9/llvm-project-releases-morello-linux-aarch64-release-1.9.tar.gz"
@@ -138,7 +146,9 @@ software:
        upstream_version: "15"
        upstream_date: 2022-07-26
        upstream_url: "https://github.com/llvm/llvm-project.git/commit/1f8ae9d7e7e4afcc4e76728b28e64941660ca3eb"
-       cheri_spec: "morello"
+       cheri_spec:
+        - name: ARM morello
+          version: A.k
        images:
          - label: "linux/aarch64c"
            link: "https://git.morello-project.org/morello/llvm-project-releases/-/archive/morello/linux-aarch64-release-1.8/llvm-project-releases-morello-linux-aarch64-release-1.8.tar.gz"
@@ -161,7 +171,9 @@ software:
        upstream_version: "15"
        upstream_date: 2022-07-26
        upstream_url: "https://github.com/llvm/llvm-project.git/commit/1f8ae9d7e7e4afcc4e76728b28e64941660ca3eb"
-       cheri_spec: "morello"
+       cheri_spec:
+        - name: ARM morello
+          version: A.k
        images:
          - label: "linux/aarch64c"
            link: "https://git.morello-project.org/morello/llvm-project-releases/-/archive/morello/linux-aarch64-release-1.6/llvm-project-releases-morello-linux-aarch64-release-1.6.tar.gz"
@@ -186,7 +198,9 @@ software:
         upstream_version: "17"
         upstream_date: 2023-07-25
         upstream_url: "https://github.com/llvm/llvm-project/commit/d0b54bb50e5110a004b41fc06dadf3fee70834b7"
-        cheri_spec: CHERI RISC-V Draft 0.9.3
+        cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
         images:
           - label: "Source"
             link: "https://github.com/CHERI-Alliance/llvm-project/tree/678272e8548fa3f021e591854d062d694086bf83"
@@ -198,7 +212,9 @@ software:
         upstream_version: "18"
         upstream_date: 2024-01-24
         upstream_url: "https://github.com/llvm/llvm-project/commit/93248729cfae82a5ca2323d4a8e15aa3b9b9c707"
-        cheri_spec: CHERI RISC-V Draft 0.9.3
+        cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
         images:
           - label: "Source"
             link: "https://github.com/CHERI-Alliance/llvm-project/tree/7ca5cdc690a7c41d3c45c53971a766812e730136"
\ No newline at end of file
diff --git a/musllibc.yaml b/musllibc.yaml
index 01a6179..bbb8ca9 100644
--- a/musllibc.yaml
+++ b/musllibc.yaml
@@ -5,19 +5,19 @@ project_summary:
   description: |-
     Musl libc is a lightweight, high-performance implementation of the C standard library designed for use in Linux-based operating systems.
     It aims to provide a clean, modern codebase that eliminates the bloat and complex overhead often found in traditional library implementations.
-  status: |-   
+  status: |-
     The last official release of musl libc for the Morello platform was in 2024, but since then there have been sporadic updates to the master branch with various fixes.
-    
+
     Codasip's work to add support for RVY (CHERI-RISC-V) to musl libc has recently been open-sourced, and is now available on the CHERI-Alliance Github.
     This version is based on the Morello musl libc, and the work to unify development of both streams in the CHERI-Alliance repo is ongoing.
     This approach is to avoid fragmentation and duplication of effort.
-    
+
     Both of these versions are based on upstream musl libc 1.2.4.
-    The latest upstream release is 1.2.5, which was released February 29th 2024. 
+    The latest upstream release is 1.2.5, which was released February 29th 2024.
 
     RVY support in musl libc will enable RISC-V RVY Linux userspace to be able to be compiled with cheribuild. You can track the progress of cheribuild support [here](https://github.com/CTSRD-CHERI/cheribuild/pull/451).
 
-  last_update: "3rd February 2026" 
+  last_update: "3rd February 2026"
   download_notes: "There are no pre-built binaries or versioned releases yet, users must build from source."
 
 project_contribution:
@@ -30,7 +30,7 @@ project_contribution:
     There are no regular meetings for these projects
 
 buildingFromSource: |-
-  The [morello/musl-libc](https://git.morello-project.org/morello/musl-libc) has instructions on how to build the latest version from source. 
+  The [morello/musl-libc](https://git.morello-project.org/morello/musl-libc) has instructions on how to build the latest version from source.
 
   Full instructions on how to build the [CHERI-Alliance/musl](https://github.com/CHERI-Alliance/musl) version can be found in the project's [README](https://github.com/CHERI-Alliance/musl/blob/codasip-cheri-riscv/README.md).
 
@@ -42,11 +42,13 @@ software:
        version_date: 2026-01-21
        version_url: "https://github.com/CHERI-Alliance/musl"
        latest: true
-       cheri_spec: "CHERI RISC-V Draft Standard 0.9.3"
        upstream_version: "v1.2.4"
        upstream_date: 2023-05-01
        upstream_url: "https://git.musl-libc.org/cgit/musl/tag/?h=v1.2.4"
-       images: 
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+       images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/musl"
 
@@ -57,22 +59,26 @@ software:
        version_date: 2025-09-18
        version_url: "https://git.morello-project.org/morello/musl-libc"
        latest: true
-       cheri_spec: Morello
        upstream_version: "v1.2.4"
        upstream_date: 2023-05-01
        upstream_url: "https://git.musl-libc.org/cgit/musl/tag/?h=v1.2.4"
-       images: 
+       cheri_spec:
+        - name: ARM morello
+          version: A.k
+       images:
          - label: "Source"
            link: "https://git.morello-project.org/morello/musl-libc"
      - version: "morello-release-1.9.0"
        version_date: 2024-07-24
        version_url: "https://git.morello-project.org/morello/musl-libc/-/tree/morello-release-1.9.0?ref_type=tags"
        latest: false
-       cheri_spec: Morello
        upstream_version: "v1.2.4"
        upstream_date: 2023-05-01
        upstream_url: "https://git.musl-libc.org/cgit/musl/tag/?h=v1.2.4"
-       images: 
+       cheri_spec:
+        - name: ARM morello
+          version: A.k
+       images:
          - label: "Source"
            link: "https://git.morello-project.org/morello/musl-libc/-/tree/morello-release-1.9.0?ref_type=tags"
- 
+
diff --git a/opensbi.yaml b/opensbi.yaml
index bcd43cb..fa79f6a 100644
--- a/opensbi.yaml
+++ b/opensbi.yaml
@@ -7,7 +7,7 @@ project_summary:
     Active development takes place in the [CHERI-Alliance/opensbi repository](https://github.com/CHERI-Alliance/opensbi) on the codasip-cheri-riscv branch.
   vulnerability_contact: "support@thecapablehub.org"
   download_notes: "There are no pre-built binaries or versioned releases."
-  last_update: "29th January 2026" 
+  last_update: "29th January 2026"
 
 project_contribution:
   src_tree: |-
@@ -33,6 +33,9 @@ software:
        upstream_version: "1.5"
        upstream_date: 2024-08-02
        upstream_url: "https://github.com/riscv-software-src/opensbi/commit/43cace6c3671e5172d0df0a8963e552bb04b7b20"
-       images: 
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+       images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/opensbi/commit/669eba10526ea9fd2f0442e0bb9aab433f3fb59a"
diff --git a/qemu.yaml b/qemu.yaml
index f6d7925..e720e24 100644
--- a/qemu.yaml
+++ b/qemu.yaml
@@ -14,10 +14,10 @@ project_summary:
     Whilst contribution guidelines for this project are yet to be published, the intention will be to keep both the [CHERI-Alliance/qemu](https://github.com/CHERI-Alliance/qemu) and the [CTSRD-CHERI/qemu](https://github.com/CTSRD-CHERI/qemu) repositories in sync where possible.
     There is a potential mid-term goal of a CHERI ISA v10 based on the standard RVY, which may include the current experimental instructions and features that did not make it into the spec.
     Although what this looks like is yet to be decided.
-    
+
   #vulnerability_contact: "support@thecapablehub.org"
   download_notes: "There are no pre-built binaries or versioned releases yet, users must build from source."
-  last_update: "27th January 2026" 
+  last_update: "27th January 2026"
 
 project_contribution:
   src_tree: |-
@@ -28,7 +28,7 @@ project_contribution:
   mailing_lists: |-
       - [WG - qemu](https://lists.cheri-alliance.org/mailman3/postorius/lists/wg-qemu.cheri-alliance.org/)
   meetings: |-
-    The CHERI Alliance [QEMU working group](https://cheri-alliance.org/who-we-are/working-groups/cheri-qemu/) hold regular meetings 
+    The CHERI Alliance [QEMU working group](https://cheri-alliance.org/who-we-are/working-groups/cheri-qemu/) hold regular meetings
 
 buildingFromSource: |-
   To build [CHERI-Alliance/qemu](https://github.com/CHERI-Alliance/qemu) from source directly:
@@ -39,9 +39,9 @@ buildingFromSource: |-
   git clone https://github.com/CHERI-Alliance/qemu.git
   cd qemu
   # Set a variable of where we will install qemu to
-  export QEMU_CHERI_INSTALL_DIR="/opt/qemu" 
+  export QEMU_CHERI_INSTALL_DIR="/opt/qemu"
   mkdir build && cd build
-  ../configure 
+  ../configure
       --prefix=${QEMU_CHERI_INSTALL_DIR}/install \
       --target-list="riscv32xcheri-softmmu riscv64xcheri-softmmu" \
       --disable-gtk --audio-drv-list="" --disable-brlapi --disable-libiscsi \
@@ -68,11 +68,15 @@ software:
        version_date: 2026-01-08
        version_url: "https://github.com/CHERI-Alliance/qemu"
        latest: true
-       cheri_spec: CHERI RISC-V Draft 0.9.3
+       cheri_spec:
+        - name: ARM morello
+          version: A.k
+        - name: CHERI RISC-V
+          version: 0.9.3
        upstream_version: "v7.0.0"
        upstream_date: 2022-04-19
        upstream_url: "https://github.com/qemu/qemu/releases/tag/v7.0.0"
-       images: 
+       images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/qemu"
 
@@ -82,10 +86,14 @@ software:
        version_date: 2026-01-08
        version_url: "https://github.com/CTSRD-CHERI/qemu/commit/0f0babda7d12acacccc43cca341645dd8c47e693"
        latest: true
-       cheri_spec: Morello, University of Cambridge ISAv9
        upstream_version: "v7.0.0"
        upstream_date: 2022-04-19
        upstream_url: "https://github.com/qemu/qemu/releases/tag/v7.0.0"
-       images: 
+       cheri_spec:
+        - name: ARM morello
+          version: A.k
+        - name: UoC RISC-V ISAv9
+          version: "9"
+       images:
          - label: "Source"
            link: "https://github.com/CTSRD-CHERI/qemu/commit/0f0babda7d12acacccc43cca341645dd8c47e693"
diff --git a/rust.yaml b/rust.yaml
index 196087a..74a2721 100644
--- a/rust.yaml
+++ b/rust.yaml
@@ -2,16 +2,16 @@ project_summary:
   category: "language"
   home_url: "https://rust.cheriot.org/"
   short_description: "CHERI enabled Rust"
-  description: |- 
+  description: |-
     [Rust](https://rust-lang.org/) is an efficient (on par with C++) system level language with a rich type system that is heavily focused on memory-safety, thread-safety and data ownership. It does not have a garbage collector, hence is well suited for embedded hardware. In practice it means that the engineer will be normally fighting the Rust compiler and its borrow checker during development to find bugs instead of using GDB at program runtime like when working with a C/C++ codebase.
     The CHERI forks complement the language's own and language specific security features. While Rust provides compile-time guarantees for safe code, CHERI provides runtime guarantees for every fragment of unsafe code, as the capabilities are implemented at the hardware level.
   status: |-
     In 2023 work bringing in Rust support to the [ARM Morello](https://git.morello-project.org/morello/) was done at [University of Kent](https://www.cs.kent.ac.uk/people/staff/mjb211/rust/index.htm), funded by [DSbD](https://www.ukri.org/what-we-do/browse-our-areas-of-investment-and-support/digital-security-by-design/) and published at [https://github.com/kent-weak-memory/rust](https://github.com/kent-weak-memory/rust) - its latest release is based on Rust 1.72.1, so it is a dated version at this point (as upstream is 1.93), it also requires an old build of [Morello LLVM](https://git.morello-project.org/morello/llvm-project/-/commit/671d6dbe2b74525702368edfa086e68f5afadc24). The authors point out that the compiler is fully tested but is still experimental and one should expect bugs. The maintenance and support shall be limited on this project.
 
     In 2025 new [UK Innovate and Department for Science, Innovation and Technology funding](https://www.ukri.org/news/21-million-backing-for-technology-to-stop-cyber-attackers/) was announced for bringing in Rust to the CHERIoT platform, work to be done by [SCI Semiconductor](https://www.scisemi.com/), but in collaboration with previous project owners from the University of Kent, who are a subcontractor, so this is a followup for the previous work done in 2023. It shall add extensions specific to [CHERIoT](https://github.com/CHERIoT-Platform) but the goal is to be compatible with _any_ CHERI platform - so this would bring CHERI support for the RVY platform, could support the legacy Morello platform and enable Rust support for _any_ CHERI enabled hardware in the future.
-    
+
     The Rust project under the banner of CHERIoT should be the only stop for CHERI Rust and its development moving forward, the project lives at [https://github.com/CHERIoT-Platform/cheri-rust](https://github.com/CHERIoT-Platform/cheri-rust).
-    
+
     The codebase shall track the [main](https://github.com/rust-lang/rust) and [beta](https://github.com/rust-lang/rust/tree/beta) branches from upstream, so the goal is to be in sync with upstream, which is very nice, we like.
 
     Please keep checking the project [homepage](https://rust.cheriot.org/) for blog posts and news.
@@ -38,19 +38,25 @@ buildingFromSource: |-
 
 software:
 
-  - arch: "CHERIoT"
+  - arch: "riscv32cheriot"
     releases:
       - version: "2494050 (main)"
         version_date: 2026-02-02
         latest: true
         version_url: "https://github.com/CHERIoT-Platform/cheri-rust/commit/249405086189a14c13d33b14ba4191e72920d36b"
-        cheri_spec: CHERIoT ISA v1.0
         upstream_version: "1.93.0"
         upstream_date: 2026-01-22
         upstream_url: "https://github.com/rust-lang/rust/releases/tag/1.93.0"
-        images: 
+        cheri_spec:
+          - name: CHERIoT
+            version: ISA v1.0
+        images:
           - label: "Source"
             link: "https://github.com/CHERIoT-Platform/cheri-rust/commit/249405086189a14c13d33b14ba4191e72920d36b"
+        docs:
+          - label: "README"
+            link: "https://github.com/CHERIoT-Platform/cheri-rust/blob/beta/README.md"
+
 
   - arch: "aarch64, aarch64c"
     releases:
@@ -58,10 +64,12 @@ software:
         version_date: 2025-09-15
         version_url: "https://github.com/kent-weak-memory/rust/tree/1.72.1-20250915-dev"
         latest: true
-        cheri_spec: "ARM Morello"
         upstream_version: "1.72.1"
         upstream_date: 2024-08-24
         upstream_url: "https://github.com/rust-lang/rust/releases/tag/1.72.0"
+        cheri_spec:
+        - name: ARM morello
+          version: A.k
         images:
           - label: "linux/x86"
             link: "https://github.com/kent-weak-memory/rust/releases/download/1.72.1-20250915-dev/rust-build-1.72.1.tar.gz"
@@ -70,15 +78,17 @@ software:
         docs:
           - label: "Release Notes"
             link: "https://github.com/kent-weak-memory/rust/releases/tag/1.72.1-20250915-dev"
-   
+
       - version: "1.56.0-20240112-dev"
         version_date: 2024-01-12
         version_url: "https://github.com/kent-weak-memory/rust/releases/tag/1.56.0-20240112-dev"
         latest: false
-        cheri_spec: "ARM Morello"
         upstream_version: "1.56.0"
         upstream_date: 2021-10-21
         upstream_url: "https://github.com/rust-lang/rust/releases/tag/1.56.0"
+        cheri_spec:
+        - name: ARM morello
+          version: A.k
         images:
           - label: "linux/x86"
             link: "https://github.com/kent-weak-memory/rust/releases/download/1.56.0-20240112-dev/rust-build-1.56.0.tar.gz"
@@ -92,7 +102,9 @@ software:
         version_date: 2023-08-04
         version_url: "https://github.com/kent-weak-memory/rust/releases/tag/1.56.0-20230804-dev"
         latest: false
-        cheri_spec: "ARM Morello"
+        cheri_spec:
+        - name: ARM morello
+          version: A.k
         upstream_version: "1.56.0"
         upstream_date: 2021-10-21
         upstream_url: "https://github.com/rust-lang/rust/releases/tag/1.56.0"
diff --git a/sel4.yaml b/sel4.yaml
index 545724d..4c9c98a 100644
--- a/sel4.yaml
+++ b/sel4.yaml
@@ -9,12 +9,12 @@ project_summary:
     Technical discussion and design proposals for integrating CHERI into seL4: [RFC-15: Support CHERI/Morello in seL4](https://github.com/seL4/rfcs/pull/21).
   vulnerability_contact: "hesham.almatary@cl.cam.ac.uk"
   download_notes: "There are no pre-built binaries or versioned releases. Users must build from source using cheribuild"
-  last_update: "21st January 2026" 
+  last_update: "21st January 2026"
 
 project_contribution:
   src_tree: |-
     The active repository is [CHERI-Alliance/CHERI-seL4](https://github.com/CHERI-Alliance/CHERI-seL4) and [CHERI-Alliance/CHERI-Microkit](https://github.com/CHERI-Alliance/CHERI-Microkit).
-    
+
     Builds are managed via the [cheribuild](https://github.com/CTSRD-CHERI/cheribuild) tool. Dependencies include a specific CHERI-forked QEMU, LLVM, and GDB, as well as Rust for the Microkit.
   slack: |-
     Support is generally discussed in the [CHERI CPU Slack](https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/cheri-slack.html) in the `#seL4` channel.
@@ -26,7 +26,7 @@ project_contribution:
 buildingFromSource: "Please keep an eye out for our [blog](/blog/) as we will soon share instructions for building from source."
 
 software:
-  - arch: "riscv64, morello"
+  - arch: "riscv64c, aarch64c"
     releases:
      - version: "9d115ee"
        version_date: 2025-01-21
@@ -35,7 +35,12 @@ software:
        upstream_version: "v13.0.0-dev"
        upstream_date: 2025-05-24
        upstream_url: "https://github.com/seL4/seL4/commit/3aafe9e0b9527794c547d12090117e1000302da0"
-       images: 
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        - name: ARM Morello
+          version: A.k
+       images:
          - label: "Source (seL4)"
            link: "https://github.com/CHERI-Alliance/CHERI-seL4/commit/9d115ee9b6da2ebe949efeae4f1dd347166d0743"
          - label: "Source (microkit)"
@@ -43,7 +48,7 @@ software:
        docs:
          - label: "seL4 Exercises"
            link: "https://cheri-alliance.github.io/CHERI-seL4-Exercises"
-  - arch: "riscv64, morello"
+  - arch: "riscv64c, aarch64c"
     releases:
      - version: "b3ed50e"
        version_date: 2025-07-29
@@ -52,7 +57,12 @@ software:
        upstream_version: "v13.0.0-dev"
        upstream_date: 2025-05-24
        upstream_url: "https://github.com/seL4/seL4/commit/3aafe9e0b9527794c547d12090117e1000302da0"
-       images: 
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        - name: ARM Morello
+          version: A.k
+       images:
          - label: "Source (seL4)"
            link: "https://github.com/CHERI-Alliance/CHERI-seL4/tree/b3ed50ed457be1c950fd3753fe2ad74aa60d55ca"
          - label: "Source (Microkit)"
diff --git a/tch-containers.yaml b/tch-containers.yaml
index a0bda54..04ca12e 100644
--- a/tch-containers.yaml
+++ b/tch-containers.yaml
@@ -12,7 +12,7 @@ project_summary:
     - [morello-yocto](https://github.com/The-Capable-Hub/tch-containers/blob/main/yocto/Dockerfile-morello) - Build container with environment setup for building with kas
     - [Zephyr](https://github.com/The-Capable-Hub/tch-containers/blob/main/zephyr) - CHERI-Zephyr SDK configured for building Zephyr applications targetting CHERI Alliance 0.9.3 spec or CTSRD ISAv9
     - [LLVM](https://github.com/The-Capable-Hub/tch-containers/blob/main/llvm) - CHERI Alliance 0.9.3 or CTSRD ISAv9 builds of the LLVM toolchain
-    
+
   status: |-
 
     The initial goals of the tch-containers repository are:
@@ -21,15 +21,15 @@ project_summary:
 
     The hope is to be able to host & support a collection of CHERI containers that can be re-used to build other tools.
     The first steps towards this are in the [CHERI-Zephyr](https://github.com/The-Capable-Hub/tch-containers/tree/main/zephyr) containers, where they now [re-use the LLVM containers](https://github.com/The-Capable-Hub/tch-containers/blob/e11c6683aa5fbfb24b0b4950861deff8c8b64886/zephyr/Dockerfile#L132).
-    
+
   vulnerability_contact: "support@thecapablehub.org"
   #download_notes: N/A
-  last_update: "29th January 2026" 
+  last_update: "29th January 2026"
 
 project_contribution:
   src_tree: |-
     - [The-Capable-Hub/tch-containers](https://github.com/The-Capable-Hub/tch-containers)
-  chat: |- 
+  chat: |-
     Feel free to create an Issue or open a PR with any comments / changes
   mailing_lists: |-
       - [cheri-discuss](https://www.thecapablehub.org/docs/mailinglists/) - For general CHERI related discussion
@@ -37,7 +37,7 @@ project_contribution:
     There are no regular meetings for this project.
 
 buildingFromSource: "Instructions on how to build the containers yourself can be found in each subfolders README."
-  
+
 software:
 
   - arch: "riscv64c"
@@ -45,8 +45,10 @@ software:
       - version: "cheri-zephyr:v0.2.0-riscv64c-isav9"
         version_url: "https://github.com/The-Capable-Hub/tch-containers/tree/main/zephyr"
         latest: true
-        cheri_spec: University of Cambridge ISAv9
-        images: 
+        cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        images:
           - label: "Dockerhub"
             link: "https://hub.docker.com/layers/capablehub/cheri-zephyr/v0.2.0-riscv64c-isav9/images/sha256-b59cd48faaa8e47fa8c51b364b2d53b71cac7397f83b427d46fa8a3030053589"
         docs:
@@ -56,8 +58,10 @@ software:
       - version: "cheri-zephyr:v0.2.0-riscv64c-rvy"
         version_url: "https://github.com/The-Capable-Hub/tch-containers/tree/main/zephyr"
         latest: true
-        cheri_spec: CHERI RISC-V Draft 0.9.3
-        images: 
+        cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        images:
           - label: "Dockerhub"
             link: "https://hub.docker.com/layers/capablehub/cheri-zephyr/v0.2.0-riscv64c-rvy/images/sha256-d46d74561cc43b616ef2a2315c74eeaf322c8d0a5edf995476676fdc17a577bc"
         docs:
@@ -67,8 +71,10 @@ software:
       - version: "cheri-ctsrd-llvm:17-riscv64-latest"
         version_url: "https://github.com/The-Capable-Hub/tch-containers/tree/main/llvm"
         latest: true
-        cheri_spec: University of Cambridge ISAv9
-        images: 
+        cheri_spec:
+        - name: UoC RISC-V ISAv9
+          version: "9"
+        images:
           - label: "Dockerhub"
             link: "https://hub.docker.com/layers/capablehub/cheri-ctsrd-llvm/17-riscv64-latest/images/sha256-0c657a3d915c4311f27414370cb6bba71994ed76371c8a3f58d406ffbe060bf2"
         docs:
@@ -77,9 +83,11 @@ software:
 
       - version: "cheri-ca-llvm:17-riscv64-latest"
         version_url: "https://github.com/The-Capable-Hub/tch-containers/tree/main/llvm"
-        latest: true
-        cheri_spec: CHERI RISC-V Draft 0.9.3
-        images: 
+        latest: false
+        cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        images:
           - label: "Dockerhub"
             link: "https://hub.docker.com/layers/capablehub/cheri-ca-llvm/17-riscv64-latest/images/sha256-2f87f05a7723d2f27523c916645142bcd5732a92a07fa3f213764db34b8c4b32"
         docs:
@@ -88,9 +96,11 @@ software:
 
       - version: "cheri-ca-llvm:18-riscv64-latest"
         version_url: "https://github.com/The-Capable-Hub/tch-containers/tree/main/llvm"
-        latest: true
-        cheri_spec: CHERI RISC-V Draft 0.9.3
-        images: 
+        latest: false
+        cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        images:
           - label: "Dockerhub"
             link: "https://hub.docker.com/layers/capablehub/cheri-ca-llvm/18-riscv64-latest/images/sha256-e51b4c4573ffd7411b4ab1d19021e85a025360979cc0dad6dc7bcf1cae2b3a3d"
         docs:
@@ -100,8 +110,10 @@ software:
       - version: "cheri-ca-llvm:19-riscv64-latest"
         version_url: "https://github.com/The-Capable-Hub/tch-containers/tree/main/llvm"
         latest: true
-        cheri_spec: CHERI RISC-V Draft 0.9.3
-        images: 
+        cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+        images:
           - label: "Dockerhub"
             link: "https://hub.docker.com/layers/capablehub/cheri-ca-llvm/19-riscv64-latest/images/sha256-c4369574491eca6eb070d59e4bf987a2d37027c0ae01c94ffb77b324a92a4ef2"
         docs:
diff --git a/uboot.yaml b/uboot.yaml
index ea296aa..31ef456 100644
--- a/uboot.yaml
+++ b/uboot.yaml
@@ -7,7 +7,7 @@ project_summary:
     Active development takes place in the [CHERI-Alliance/u-boot repository](https://github.com/CHERI-Alliance/u-boot) on the codasip-cheri-riscv branch.
   vulnerability_contact: "support@thecapablehub.org"
   download_notes: "There are no pre-built binaries or versioned releases."
-  last_update: "28th January 2026" 
+  last_update: "28th January 2026"
 
 project_contribution:
   src_tree: |-
@@ -33,6 +33,9 @@ software:
        upstream_version: "2024.10"
        upstream_date: 2024-10-07
        upstream_url: "https://github.com/u-boot/u-boot/commit/f919c3a889f0ec7d63a48b5d0ed064386b0980bd"
-       images: 
+       cheri_spec:
+        - name: CHERI RISC-V (RVY)
+          version: 0.9.3
+       images:
          - label: "Source"
            link: "https://github.com/CHERI-Alliance/u-boot/commit/57524f1599083d95809c3bc4345ebfecbf31ea7e"