diff --git a/iso/empanadas/empanadas/configs/el10.yaml b/iso/empanadas/empanadas/configs/el10.yaml
index 881f491..c215d70 100644
--- a/iso/empanadas/empanadas/configs/el10.yaml
+++ b/iso/empanadas/empanadas/configs/el10.yaml
@@ -121,6 +121,20 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    supported_builds:
+      - live
+      - cloud
+      - container
+      - vagrant
+    allowed_arches:
+      - x86_64
+      - aarch64
+      - ppc64le
+      - s390x
+    required_pkgs: []
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el10lh.yaml b/iso/empanadas/empanadas/configs/el10lh.yaml
index a807cdd..156537d 100644
--- a/iso/empanadas/empanadas/configs/el10lh.yaml
+++ b/iso/empanadas/empanadas/configs/el10lh.yaml
@@ -121,6 +121,20 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    supported_builds:
+      - live
+      - cloud
+      - container
+      - vagrant
+    allowed_arches:
+      - x86_64
+      - aarch64
+      - ppc64le
+      - s390x
+    required_pkgs: []
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml
index c86d861..c7eaa18 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -105,7 +105,7 @@
   livemap:
     builder: "lorax"
     git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
-    branch: 'r9-beta'
+    branch: 'r9'
     ksentry:
       Workstation: rocky-live-workstation.ks
       Workstation-Lite: rocky-live-workstation-lite.ks
@@ -121,6 +121,20 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    supported_builds:
+      - live
+      - cloud
+      - container
+      - vagrant
+    allowed_arches:
+      - x86_64
+      - aarch64
+      - ppc64le
+      - s390x
+    required_pkgs: []
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
@@ -158,7 +172,7 @@
   extra_files:
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/'
-    branch: 'r9'
+    branch: 'r9-beta'
     gpg:
       stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
       testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index 9d1e9b5..8569e99 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -1,10 +1,10 @@
 ---
 '9-lookahead':
-  fullname: 'Rocky Linux 9.4'
-  revision: '9.4'
+  fullname: 'Rocky Linux 9.5'
+  revision: '9.5'
   rclvl: 'LH1'
   major: '9'
-  minor: '4'
+  minor: '5'
   profile: '9-lookahead'
   disttag: 'el9'
   code: "Blue Onyx"
@@ -121,6 +121,20 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    supported_builds:
+      - live
+      - cloud
+      - container
+      - vagrant
+    allowed_arches:
+      - x86_64
+      - aarch64
+      - ppc64le
+      - s390x
+    required_pkgs: []
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'