diff --git a/arch/ext/Zba.yaml b/arch/ext/Zba.yaml
index 0a113ab33..041c238b6 100644
--- a/arch/ext/Zba.yaml
+++ b/arch/ext/Zba.yaml
@@ -17,7 +17,45 @@ Zba:
     of wider elements. The `slli.uw` -- added in this extension -- can be used when the index is to
     be interpreted as an unsigned word.
   type: unprivileged
+  company:
+    name: RISC-V International
+    url: https://riscv.org
   versions:
   - version: 1.0
     state: ratified
     ratification_date: 2021-06
+    repositories:
+      - url: https://github.com/riscv/riscv-bitmanip
+        branch: main
+    contributors:
+      - name: Jacob Bachmeyer
+      - name: Allen Baum
+      - name: Ari Ben
+      - name: Alex Bradbury
+      - name: Steven Brager
+      - name: Rogier Brussee
+      - name: Michael Clark
+      - name: Ken Dockser
+      - name: Paul Donahue
+      - name: Dennis Ferguson
+      - name: Fabian Giesen
+      - name: John Hauser
+      - name: Robert Henry
+      - name: Bruce Holt
+      - name: Po-wei Huang
+      - name: Ben Marshall
+      - name: Rex McCrary
+      - name: Lee Moore
+      - name: Jiri Moravec
+      - name: Samuel Neves
+      - name: Markus Oberhumer
+      - name: Christopher Olson
+      - name: Nils Pipenbrinck
+      - name: Joseph Rahmeh
+      - name: Xue Saw
+      - name: Tommy Thorn
+      - name: Philipp Tomsich
+      - name: Avishai Tvila
+      - name: Andrew Waterman
+      - name: Thomas Wicki
+      - name: Claire Wolf
diff --git a/arch/ext/Zbb.yaml b/arch/ext/Zbb.yaml
index 5a046de02..40e37d763 100644
--- a/arch/ext/Zbb.yaml
+++ b/arch/ext/Zbb.yaml
@@ -5,7 +5,45 @@ Zbb:
   description: |
     Basic bit manipulation
   type: unprivileged
+  company:
+    name: RISC-V International
+    url: https://riscv.org
   versions:
   - version: 1.0
     state: ratified
     ratification_date: 2021-06
+    repositories:
+      - url: https://github.com/riscv/riscv-bitmanip
+        branch: main
+    contributors:
+      - name: Jacob Bachmeyer
+      - name: Allen Baum
+      - name: Ari Ben
+      - name: Alex Bradbury
+      - name: Steven Brager
+      - name: Rogier Brussee
+      - name: Michael Clark
+      - name: Ken Dockser
+      - name: Paul Donahue
+      - name: Dennis Ferguson
+      - name: Fabian Giesen
+      - name: John Hauser
+      - name: Robert Henry
+      - name: Bruce Holt
+      - name: Po-wei Huang
+      - name: Ben Marshall
+      - name: Rex McCrary
+      - name: Lee Moore
+      - name: Jiri Moravec
+      - name: Samuel Neves
+      - name: Markus Oberhumer
+      - name: Christopher Olson
+      - name: Nils Pipenbrinck
+      - name: Joseph Rahmeh
+      - name: Xue Saw
+      - name: Tommy Thorn
+      - name: Philipp Tomsich
+      - name: Avishai Tvila
+      - name: Andrew Waterman
+      - name: Thomas Wicki
+      - name: Claire Wolf
diff --git a/arch/ext/Zbc.yaml b/arch/ext/Zbc.yaml
index 84ded5eac..6d0e0d8d1 100644
--- a/arch/ext/Zbc.yaml
+++ b/arch/ext/Zbc.yaml
@@ -5,7 +5,47 @@ Zbc:
   description: |
     Carry-less multiplication is the multiplication in the polynomial ring over GF(2).
   type: unprivileged
+  company:
+    name: RISC-V International
+    url: https://riscv.org
   versions:
   - version: 1.0
     state: ratified
     ratification_date: 2021-06
+    repositories:
+      - url: https://github.com/riscv/riscv-bitmanip
+        branch: main
+    contributors:
+      - name: Jacob Bachmeyer
+      - name: Allen Baum
+      - name: Ari Ben
+      - name: Alex Bradbury
+      - name: Steven Brager
+      - name: Rogier Brussee
+      - name: Michael Clark
+      - name: Ken Dockser
+      - name: Paul Donahue
+      - name: Dennis Ferguson
+      - name: Fabian Giesen
+      - name: John Hauser
+      - name: Robert Henry
+      - name: Bruce Holt
+      - name: Po-wei Huang
+      - name: Ben Marshall
+      - name: Rex McCrary
+      - name: Lee Moore
+      - name: Jiri Moravec
+      - name: Samuel Neves
+      - name: Markus Oberhumer
+      - name: Christopher Olson
+      - name: Nils Pipenbrinck
+      - name: Joseph Rahmeh
+      - name: Xue Saw
+      - name: Tommy Thorn
+      - name: Philipp Tomsich
+      - name: Avishai Tvila
+      - name: Andrew Waterman
+      - name: Thomas Wicki
+      - name: Claire Wolf
+
+
diff --git a/arch/ext/Zbs.yaml b/arch/ext/Zbs.yaml
new file mode 100644
index 000000000..5964db6d8
--- /dev/null
+++ b/arch/ext/Zbs.yaml
@@ -0,0 +1,52 @@
+# yaml-language-server: $schema=../../schemas/ext_schema.json
+
+Zbs:
+  long_name: Single-bit instructions
+  description: |
+    The single-bit instructions provide a mechanism to set, clear, invert, or extract a single bit
+    in a register. The bit is specified by its index
+  type: unprivileged
+  company:
+    name: RISC-V International
+    url: https://riscv.org
+  versions:
+  - version: 1.0
+    state: ratified
+    ratification_date: 2021-06
+    repositories:
+      - url: https://github.com/riscv/riscv-bitmanip
+        branch: main
+    contributors:
+      - name: Jacob Bachmeyer
+      - name: Allen Baum
+      - name: Ari Ben
+      - name: Alex Bradbury
+      - name: Steven Brager
+      - name: Rogier Brussee
+      - name: Michael Clark
+      - name: Ken Dockser
+      - name: Paul Donahue
+      - name: Dennis Ferguson
+      - name: Fabian Giesen
+      - name: John Hauser
+      - name: Robert Henry
+      - name: Bruce Holt
+      - name: Po-wei Huang
+      - name: Ben Marshall
+      - name: Rex McCrary
+      - name: Lee Moore
+      - name: Jiri Moravec
+      - name: Samuel Neves
+      - name: Markus Oberhumer
+      - name: Christopher Olson
+      - name: Nils Pipenbrinck
+      - name: Joseph Rahmeh
+      - name: Xue Saw
+      - name: Tommy Thorn
+      - name: Philipp Tomsich
+      - name: Avishai Tvila
+      - name: Andrew Waterman
+      - name: Thomas Wicki
+      - name: Claire Wolf
+
+