diff --git a/playbooks/manual/riscv-keytabs.yml b/playbooks/manual/riscv-keytabs.yml
index 06769df7c4..d8f05b6407 100644
--- a/playbooks/manual/riscv-keytabs.yml
+++ b/playbooks/manual/riscv-keytabs.yml
@@ -44,3 +44,23 @@
       - buildhw-riscv-18.fedoraproject.org
       - buildhw-riscv-19.fedoraproject.org
       - buildhw-riscv-20.fedoraproject.org
+      - buildhw-riscv-21.fedoraproject.org
+      - buildhw-riscv-22.fedoraproject.org
+      - buildhw-riscv-23.fedoraproject.org
+      - buildhw-riscv-24.fedoraproject.org
+      - buildhw-riscv-25.fedoraproject.org
+      - buildhw-riscv-26.fedoraproject.org
+      - buildhw-riscv-27.fedoraproject.org
+      - buildhw-riscv-28.fedoraproject.org
+      - buildhw-riscv-29.fedoraproject.org
+      - buildhw-riscv-30.fedoraproject.org
+      - buildhw-riscv-31.fedoraproject.org
+      - buildhw-riscv-32.fedoraproject.org
+      - buildhw-riscv-33.fedoraproject.org
+      - buildhw-riscv-34.fedoraproject.org
+      - buildhw-riscv-35.fedoraproject.org
+      - buildhw-riscv-36.fedoraproject.org
+      - buildhw-riscv-37.fedoraproject.org
+      - buildhw-riscv-38.fedoraproject.org
+      - buildhw-riscv-39.fedoraproject.org
+      - buildhw-riscv-40.fedoraproject.org