diff --git a/iso/empanadas/empanadas/configs/el10.yaml b/iso/empanadas/empanadas/configs/el10.yaml
index 73efe7e..881f491 100644
--- a/iso/empanadas/empanadas/configs/el10.yaml
+++ b/iso/empanadas/empanadas/configs/el10.yaml
@@ -121,10 +121,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r10'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r10/'
   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 b2dd23f..a807cdd 100644
--- a/iso/empanadas/empanadas/configs/el10lh.yaml
+++ b/iso/empanadas/empanadas/configs/el10lh.yaml
@@ -121,10 +121,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r10s'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r10s/'
   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/el8-beta.yaml b/iso/empanadas/empanadas/configs/el8-beta.yaml
index 0469d60..6c47347 100644
--- a/iso/empanadas/empanadas/configs/el8-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el8-beta.yaml
@@ -108,10 +108,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r8-beta'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r8-beta/'
   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/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml
index 503a06c..fd83b5e 100644
--- a/iso/empanadas/empanadas/configs/el8.yaml
+++ b/iso/empanadas/empanadas/configs/el8.yaml
@@ -113,10 +113,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r8'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r8/'
   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/el8lh.yaml b/iso/empanadas/empanadas/configs/el8lh.yaml
index 6bbd1eb..1008f93 100644
--- a/iso/empanadas/empanadas/configs/el8lh.yaml
+++ b/iso/empanadas/empanadas/configs/el8lh.yaml
@@ -108,10 +108,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r8s'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r8s/'
   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 dd76f2d..c86d861 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -121,10 +121,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r9-beta'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r9-beta/'
   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.yaml b/iso/empanadas/empanadas/configs/el9.yaml
index 8a3a10b..5132103 100644
--- a/iso/empanadas/empanadas/configs/el9.yaml
+++ b/iso/empanadas/empanadas/configs/el9.yaml
@@ -121,10 +121,20 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/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/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index 474e14a..9d1e9b5 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -121,10 +121,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r9s'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r9s/'
   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/rln.yaml b/iso/empanadas/empanadas/configs/rln.yaml
index 04c6cb1..9319cc6 100644
--- a/iso/empanadas/empanadas/configs/rln.yaml
+++ b/iso/empanadas/empanadas/configs/rln.yaml
@@ -121,10 +121,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r10'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r10/'
   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/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index da8a2c7..f6e0d0b 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -1670,8 +1670,7 @@ class LiveBuild:
 
     def run_build_live_iso(self):
         """
-        Builds DVD images based on the data created from the initial lorax on
-        each arch. This should NOT be called during the usual run() section.
+        Builds live images based on the data provided at init.
         """
         sync_root = self.compose_latest_sync
 
@@ -1682,6 +1681,10 @@ class LiveBuild:
             self.log.error(Color.FAIL + 'Running an unsupported architecture.')
             raise SystemExit()
 
+        if self.image not in self.livemap['ksentry'].keys():
+            self.log.error(Color.FAIL + 'Trying to build an unknown live image type.')
+            raise SystemExit()
+
         # Check that the builder is lorax, we don't support anything else yet
         if self.livebuilder != "lorax":
             self.log.error(Color.FAIL + 'Attempting to use an unsupported builder.')
@@ -1874,7 +1877,7 @@ class LiveBuild:
 
         print(entry_name_list, cmd, entries_dir)
         for pod in entry_name_list:
-            podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
+            podman_cmd_entry = '{} run --privileged -d -it -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
                     cmd,
                     self.compose_root,
                     self.compose_root,