diff --git a/iso/empanadas/Containerfile.imagefactory b/iso/empanadas/Containerfile.imagefactory
index d6b4aca..98b14b7 100644
--- a/iso/empanadas/Containerfile.imagefactory
+++ b/iso/empanadas/Containerfile.imagefactory
@@ -57,7 +57,7 @@ RUN rm -rf /etc/yum.repos.d/*.repo /get_arch
 
 RUN pip install awscli
 
-ARG BRANCH r9
+ARG BRANCH=r9
 RUN git clone https://git.resf.org/sig_core/kickstarts.git --branch $BRANCH /kickstarts
 
 RUN pip install 'git+https://git.resf.org/sig_core/toolkit.git@devel#egg=empanadas&subdirectory=iso/empanadas'
diff --git a/iso/empanadas/empanadas/__init__.py b/iso/empanadas/empanadas/__init__.py
index 7fd229a..abeeedb 100644
--- a/iso/empanadas/empanadas/__init__.py
+++ b/iso/empanadas/empanadas/__init__.py
@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '0.4.0'
diff --git a/iso/empanadas/empanadas/configs/el8-beta.yaml b/iso/empanadas/empanadas/configs/el8-beta.yaml
new file mode 100644
index 0000000..972bd57
--- /dev/null
+++ b/iso/empanadas/empanadas/configs/el8-beta.yaml
@@ -0,0 +1,137 @@
+---
+'8':
+  fullname: 'Rocky Linux 8'
+  revision: '8.7'
+  rclvl: 'RC1'
+  major: '8'
+  minor: '7'
+  profile: '8'
+  bugurl: 'https://bugs.rockylinux.org'
+  checksum: 'sha256'
+  fedora_major: '20'
+  allowed_arches:
+    - x86_64
+    - aarch64
+  provide_multilib: False
+  project_id: '26694529-26cd-44bd-bc59-1c1195364322'
+  repo_symlinks:
+    devel: 'Devel'
+    NFV: 'nfv'
+  renames:
+    all: 'devel'
+  all_repos:
+    - 'BaseOS'
+    - 'AppStream'
+    - 'PowerTools'
+    - 'HighAvailability'
+    - 'ResilientStorage'
+    - 'RT'
+    - 'NFV'
+    - 'extras'
+    - 'devel'
+    - 'plus'
+  structure:
+    packages: 'os/Packages'
+    repodata: 'os/repodata'
+  iso_map:
+    xorrisofs: False
+    iso_level: False
+    images:
+      dvd:
+        disc: True
+        variant: 'AppStream'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+      minimal:
+        disc: True
+        isoskip: True
+        repos:
+          - 'minimal'
+          - 'BaseOS'
+        variant: 'minimal'
+      BaseOS:
+        disc: False
+        isoskip: True
+        variant: 'BaseOS'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+    lorax:
+      repos:
+        - 'BaseOS'
+        - 'AppStream'
+      variant: 'BaseOS'
+      lorax_removes:
+        - 'libreport-rhel-anaconda-bugzilla'
+      required_pkgs:
+        - 'lorax'
+        - 'genisoimage'
+        - 'isomd5sum'
+        - 'lorax-templates-rhel'
+        - 'lorax-templates-generic'
+        - 'xorriso'
+  cloudimages:
+    images:
+      EC2:
+        format: raw
+      GenericCloud:
+        format: qcow2
+  livemap:
+    git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
+    branch: 'r8'
+    ksentry:
+      Workstation: rocky-live-workstation.ks
+      Workstation-Lite: rocky-live-workstation-lite.ks
+      XFCE: rocky-live-xfce.ks
+      KDE: rocky-live-kde.ks
+    allowed_arches:
+      - x86_64
+    required_pkgs:
+      - 'lorax-lmc-novirt'
+      - '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'
+      aarch64: '--forcearch=aarch64 --arch=aarch64 --arch=noarch'
+      ppc64le: '--forcearch=ppc64le --arch=ppc64le --arch=noarch'
+      s390x: '--forcearch=s390x --arch=s390x --arch=noarch'
+    repos:
+      BaseOS: []
+      AppStream:
+        - BaseOS
+      PowerTools:
+        - BaseOS
+        - AppStream
+      HighAvailability:
+        - BaseOS
+        - AppStream
+      ResilientStorage:
+        - BaseOS
+        - AppStream
+      RT:
+        - BaseOS
+        - AppStream
+      NFV:
+        - BaseOS
+        - AppStream
+  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/r8/'
+    branch: 'r8'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      testing: 'SOURCES/RPM-GPG-KEY-rockytesting'
+    list:
+      - 'SOURCES/COMMUNITY-CHARTER'
+      - 'SOURCES/EULA'
+      - 'SOURCES/LICENSE'
+      - 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      - 'SOURCES/RPM-GPG-KEY-rockytesting'
+...
diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml
index 1ece4b1..bf40ccb 100644
--- a/iso/empanadas/empanadas/configs/el8.yaml
+++ b/iso/empanadas/empanadas/configs/el8.yaml
@@ -1,21 +1,24 @@
 ---
 '8':
   fullname: 'Rocky Linux 8'
-  revision: '8.6'
-  rclvl: 'RC2'
+  revision: '8.7'
+  rclvl: 'RC1'
   major: '8'
-  minor: '6'
+  minor: '7'
   profile: '8'
   bugurl: 'https://bugs.rockylinux.org'
+  checksum: 'sha256'
+  fedora_major: '20'
   allowed_arches:
     - x86_64
     - aarch64
   provide_multilib: False
-  project_id: ''
+  project_id: 'e9cfc87c-d2d2-42d5-a121-852101f1a966'
   repo_symlinks:
     devel: 'Devel'
     NFV: 'nfv'
-  renames: {}
+  renames:
+    all: 'devel'
   all_repos:
     - 'BaseOS'
     - 'AppStream'
@@ -27,23 +30,6 @@
     - 'extras'
     - 'devel'
     - 'plus'
-    - 'rockyrpi'
-  no_comps_or_groups:
-    - 'extras'
-    - 'devel'
-    - 'plus'
-    - 'rockyrpi'
-  comps_or_groups:
-    - 'BaseOS'
-    - 'AppStream'
-    - 'PowerTools'
-    - 'HighAvailability'
-    - 'ResilientStorage'
-    - 'RT'
-    - 'NFV'
-  has_modules:
-    - 'AppStream'
-    - 'PowerTools'
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -93,7 +79,7 @@
         format: qcow2
   livemap:
     git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
-    branch: 'r9'
+    branch: 'r8'
     ksentry:
       Workstation: rocky-live-workstation.ks
       Workstation-Lite: rocky-live-workstation-lite.ks
diff --git a/iso/empanadas/empanadas/configs/el8lh.yaml b/iso/empanadas/empanadas/configs/el8lh.yaml
new file mode 100644
index 0000000..0cace3d
--- /dev/null
+++ b/iso/empanadas/empanadas/configs/el8lh.yaml
@@ -0,0 +1,137 @@
+---
+'8':
+  fullname: 'Rocky Linux 8'
+  revision: '8.8'
+  rclvl: 'RC1'
+  major: '8'
+  minor: '8'
+  profile: '8'
+  bugurl: 'https://bugs.rockylinux.org'
+  checksum: 'sha256'
+  fedora_major: '20'
+  allowed_arches:
+    - x86_64
+    - aarch64
+  provide_multilib: False
+  project_id: '3b0e9ec7-0679-4176-b253-8528eb3255eb'
+  repo_symlinks:
+    devel: 'Devel'
+    NFV: 'nfv'
+  renames:
+    all: 'devel'
+  all_repos:
+    - 'BaseOS'
+    - 'AppStream'
+    - 'PowerTools'
+    - 'HighAvailability'
+    - 'ResilientStorage'
+    - 'RT'
+    - 'NFV'
+    - 'extras'
+    - 'devel'
+    - 'plus'
+  structure:
+    packages: 'os/Packages'
+    repodata: 'os/repodata'
+  iso_map:
+    xorrisofs: False
+    iso_level: False
+    images:
+      dvd:
+        disc: True
+        variant: 'AppStream'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+      minimal:
+        disc: True
+        isoskip: True
+        repos:
+          - 'minimal'
+          - 'BaseOS'
+        variant: 'minimal'
+      BaseOS:
+        disc: False
+        isoskip: True
+        variant: 'BaseOS'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+    lorax:
+      repos:
+        - 'BaseOS'
+        - 'AppStream'
+      variant: 'BaseOS'
+      lorax_removes:
+        - 'libreport-rhel-anaconda-bugzilla'
+      required_pkgs:
+        - 'lorax'
+        - 'genisoimage'
+        - 'isomd5sum'
+        - 'lorax-templates-rhel'
+        - 'lorax-templates-generic'
+        - 'xorriso'
+  cloudimages:
+    images:
+      EC2:
+        format: raw
+      GenericCloud:
+        format: qcow2
+  livemap:
+    git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
+    branch: 'r8'
+    ksentry:
+      Workstation: rocky-live-workstation.ks
+      Workstation-Lite: rocky-live-workstation-lite.ks
+      XFCE: rocky-live-xfce.ks
+      KDE: rocky-live-kde.ks
+    allowed_arches:
+      - x86_64
+    required_pkgs:
+      - 'lorax-lmc-novirt'
+      - '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'
+      aarch64: '--forcearch=aarch64 --arch=aarch64 --arch=noarch'
+      ppc64le: '--forcearch=ppc64le --arch=ppc64le --arch=noarch'
+      s390x: '--forcearch=s390x --arch=s390x --arch=noarch'
+    repos:
+      BaseOS: []
+      AppStream:
+        - BaseOS
+      PowerTools:
+        - BaseOS
+        - AppStream
+      HighAvailability:
+        - BaseOS
+        - AppStream
+      ResilientStorage:
+        - BaseOS
+        - AppStream
+      RT:
+        - BaseOS
+        - AppStream
+      NFV:
+        - BaseOS
+        - AppStream
+  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/r8/'
+    branch: 'r8'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      testing: 'SOURCES/RPM-GPG-KEY-rockytesting'
+    list:
+      - 'SOURCES/COMMUNITY-CHARTER'
+      - 'SOURCES/EULA'
+      - 'SOURCES/LICENSE'
+      - 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      - 'SOURCES/RPM-GPG-KEY-rockytesting'
+...
diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml
index 39719e1..2fe24a4 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -8,13 +8,14 @@
   profile: '9-beta'
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
+  fedora_major: '20'
   allowed_arches:
     - x86_64
     - aarch64
     - ppc64le
     - s390x
   provide_multilib: True
-  project_id: ''
+  project_id: '0048077b-1573-4cb7-8ba7-cce823857ba5'
   repo_symlinks:
     NFV: 'nfv'
   renames:
@@ -87,8 +88,10 @@
       Workstation-Lite: rocky-live-workstation-lite.ks
       XFCE: rocky-live-xfce.ks
       KDE: rocky-live-kde.ks
+      MATE: rocky-live-mate.ks
     allowed_arches:
       - x86_64
+      - aarch64
     required_pkgs:
       - 'lorax-lmc-novirt'
       - 'vim-minimal'
diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml
index f67f28c..d586ff8 100644
--- a/iso/empanadas/empanadas/configs/el9.yaml
+++ b/iso/empanadas/empanadas/configs/el9.yaml
@@ -8,6 +8,7 @@
   profile: '9'
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
+  fedora_major: '20'
   allowed_arches:
     - x86_64
     - aarch64
@@ -88,8 +89,10 @@
       Workstation-Lite: rocky-live-workstation-lite.ks
       XFCE: rocky-live-xfce.ks
       KDE: rocky-live-kde.ks
+      MATE: rocky-live-mate.ks
     allowed_arches:
       - x86_64
+      - aarch64
     required_pkgs:
       - 'lorax-lmc-novirt'
       - 'vim-minimal'
diff --git a/iso/empanadas/empanadas/configs/el9alt.yaml b/iso/empanadas/empanadas/configs/el9alt.yaml
new file mode 100644
index 0000000..680b1df
--- /dev/null
+++ b/iso/empanadas/empanadas/configs/el9alt.yaml
@@ -0,0 +1,58 @@
+# This is specifically for secondary/tertiary architectures
+---
+'9altarch':
+  fullname: 'Rocky Linux 9.0'
+  revision: '9.0'
+  rclvl: 'RC2'
+  major: '9'
+  minor: '0'
+  profile: '9'
+  bugurl: 'https://bugs.rockylinux.org'
+  checksum: 'sha256'
+  fedora_major: '20'
+  allowed_arches:
+    - armv7hl
+    - riscv64
+  provide_multilib: False
+  project_id: ''
+  renames:
+    all: 'devel'
+  all_repos:
+    - 'all'
+    - 'BaseOS'
+    - 'AppStream'
+    - 'CRB'
+    - 'extras'
+    - 'plus'
+  structure:
+    packages: 'os/Packages'
+    repodata: 'os/repodata'
+  iso_map: {}
+  livemap: {}
+  repoclosure_map:
+    arches:
+      armv7hl: '--forcearch=armv7hl --arch=noarch'
+      riscv64: '--forcearch=riscv64 --arch=noarch'
+    repos:
+      devel: []
+      BaseOS: []
+      AppStream:
+        - BaseOS
+      CRB:
+        - BaseOS
+        - AppStream
+  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'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
+    list:
+      - 'SOURCES/Contributors'
+      - 'SOURCES/COMMUNITY-CHARTER'
+      - 'SOURCES/EULA'
+      - 'SOURCES/LICENSE'
+      - 'SOURCES/RPM-GPG-KEY-Rocky-9'
+      - 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
+...
diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index e817298..953b5ac 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -1,20 +1,21 @@
 ---
 '9-lookahead':
-  fullname: 'Rocky Linux 9.1'
-  revision: '9.1'
+  fullname: 'Rocky Linux 9.2'
+  revision: '9.2'
   rclvl: 'LH1'
   major: '9'
-  minor: '1'
+  minor: '2'
   profile: '9-lookahead'
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
+  fedora_major: '20'
   allowed_arches:
     - x86_64
     - aarch64
     - ppc64le
     - s390x
   provide_multilib: True
-  project_id: ''
+  project_id: '6794b5a8-290b-4d0d-ad5a-47164329cbb0'
   repo_symlinks:
     NFV: 'nfv'
   renames:
@@ -87,8 +88,10 @@
       Workstation-Lite: rocky-live-workstation-lite.ks
       XFCE: rocky-live-xfce.ks
       KDE: rocky-live-kde.ks
+      MATE: rocky-live-mate.ks
     allowed_arches:
       - x86_64
+      - aarch64
     required_pkgs:
       - 'lorax-lmc-novirt'
       - 'vim-minimal'
diff --git a/iso/empanadas/empanadas/configs/rln.yaml b/iso/empanadas/empanadas/configs/rln.yaml
index 3df3104..8f5feed 100644
--- a/iso/empanadas/empanadas/configs/rln.yaml
+++ b/iso/empanadas/empanadas/configs/rln.yaml
@@ -88,6 +88,7 @@
       KDE: rocky-live-kde.ks
     allowed_arches:
       - x86_64
+      - aarch64
     required_pkgs:
       - 'lorax-lmc-novirt'
       - 'vim-minimal'
diff --git a/iso/empanadas/empanadas/scripts/build_image.py b/iso/empanadas/empanadas/scripts/build_image.py
index 5085253..8d8408f 100644
--- a/iso/empanadas/empanadas/scripts/build_image.py
+++ b/iso/empanadas/empanadas/scripts/build_image.py
@@ -388,7 +388,7 @@ class ImageBuild:
             except Exception as e:
                 log.exception(e)
             finally:
-                f.flush()   
+                f.flush()
 
 def run():
     try:
diff --git a/iso/empanadas/empanadas/scripts/build_iso_extra.py b/iso/empanadas/empanadas/scripts/build_iso_extra.py
index b645747..90b2681 100755
--- a/iso/empanadas/empanadas/scripts/build_iso_extra.py
+++ b/iso/empanadas/empanadas/scripts/build_iso_extra.py
@@ -17,6 +17,8 @@ parser.add_argument('--logger', type=str)
 parser.add_argument('--extra-iso', type=str, help="Granular choice in which iso is built")
 parser.add_argument('--extra-iso-mode', type=str, default='local')
 parser.add_argument('--hashed', action='store_true')
+parser.add_argument('--updated-image', action='store_true')
+parser.add_argument('--image-increment',type=str, default='0')
 results = parser.parse_args()
 rlvars = rldict[results.release]
 major = rlvars['major']
@@ -32,7 +34,9 @@ a = IsoBuild(
         extra_iso_mode=results.extra_iso_mode,
         compose_dir_is_here=results.local_compose,
         hashed=results.hashed,
-        logger=results.logger
+        logger=results.logger,
+        updated_image=results.updated_image,
+        image_increment=results.image_increment
 )
 
 def run():
diff --git a/iso/empanadas/empanadas/scripts/generate_compose.py b/iso/empanadas/empanadas/scripts/generate_compose.py
index 19b85a1..f388a7e 100755
--- a/iso/empanadas/empanadas/scripts/generate_compose.py
+++ b/iso/empanadas/empanadas/scripts/generate_compose.py
@@ -14,7 +14,8 @@ parser = argparse.ArgumentParser(description="Peridot Sync and Compose")
 
 # All of our options
 parser.add_argument('--release', type=str, help="Major Release Version or major-type (eg 9-beta)", required=True)
-parser.add_argument('--symlink', action='store_true', help="symlink")
+parser.add_argument('--sig', type=str, help="SIG Name if applicable")
+parser.add_argument('--symlink', action='store_true', help="symlink to latest")
 parser.add_argument('--logger', type=str)
 
 # Parse them
@@ -48,6 +49,9 @@ def run():
     profile = rlvars['profile']
     logger = log
 
+    if results.sig is not None:
+        shortname = 'SIG-' + results.sig
+
     generated_dir = Shared.generate_compose_dirs(
             compose_base,
             shortname,
diff --git a/iso/empanadas/empanadas/scripts/peridot_repoclosure.py b/iso/empanadas/empanadas/scripts/peridot_repoclosure.py
new file mode 100644
index 0000000..b19757f
--- /dev/null
+++ b/iso/empanadas/empanadas/scripts/peridot_repoclosure.py
@@ -0,0 +1,38 @@
+# This is for doing repoclosures upstream
+
+import argparse
+
+from empanadas.common import *
+from empanadas.util import Checks
+from empanadas.util import RepoSync
+
+# Start up the parser baby
+parser = argparse.ArgumentParser(description="Peridot Upstream Repoclosure")
+
+# All of our options
+parser.add_argument('--release', type=str, help="Major Release Version or major-type (eg 9-beta)", required=True)
+parser.add_argument('--simple', action='store_false')
+parser.add_argument('--enable-repo-gpg-check', action='store_true')
+parser.add_argument('--hashed', action='store_true')
+parser.add_argument('--logger', type=str)
+
+# Parse them
+results = parser.parse_args()
+rlvars = rldict[results.release]
+major = rlvars['major']
+
+r = Checks(rlvars, config['arch'])
+r.check_valid_arch()
+
+a = RepoSync(
+        rlvars,
+        config,
+        major=major,
+        hashed=results.hashed,
+        parallel=results.simple,
+        repo_gpg_check=results.enable_repo_gpg_check,
+        logger=results.logger,
+)
+
+def run():
+    a.run_upstream_repoclosure()
diff --git a/iso/empanadas/empanadas/scripts/pull_cloud_image.py b/iso/empanadas/empanadas/scripts/pull_cloud_image.py
index 4e175de..84e8718 100755
--- a/iso/empanadas/empanadas/scripts/pull_cloud_image.py
+++ b/iso/empanadas/empanadas/scripts/pull_cloud_image.py
@@ -9,7 +9,7 @@ from empanadas.util import IsoBuild
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")
 
 parser.add_argument('--release', type=str, help="Major Release Version", required=True)
-parser.add_argument('--s3', action='store_true', help="Release Candidate")
+parser.add_argument('--s3', action='store_true', help="S3")
 parser.add_argument('--arch', type=str, help="Architecture")
 parser.add_argument('--local-compose', action='store_true', help="Compose Directory is Here")
 parser.add_argument('--force-download', action='store_true', help="Force a download")
diff --git a/iso/empanadas/empanadas/scripts/pull_unpack_tree.py b/iso/empanadas/empanadas/scripts/pull_unpack_tree.py
index 77f8100..54d3cef 100755
--- a/iso/empanadas/empanadas/scripts/pull_unpack_tree.py
+++ b/iso/empanadas/empanadas/scripts/pull_unpack_tree.py
@@ -9,7 +9,7 @@ from empanadas.util import IsoBuild
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")
 
 parser.add_argument('--release', type=str, help="Major Release Version", required=True)
-parser.add_argument('--s3', action='store_true', help="Release Candidate")
+parser.add_argument('--s3', action='store_true', help="S3")
 parser.add_argument('--rc', action='store_true', help="Release Candidate")
 parser.add_argument('--arch', type=str, help="Architecture")
 parser.add_argument('--local-compose', action='store_true', help="Compose Directory is Here")
diff --git a/iso/empanadas/empanadas/scripts/sync_from_peridot.py b/iso/empanadas/empanadas/scripts/sync_from_peridot.py
index d025f65..2110fac 100755
--- a/iso/empanadas/empanadas/scripts/sync_from_peridot.py
+++ b/iso/empanadas/empanadas/scripts/sync_from_peridot.py
@@ -26,6 +26,9 @@ parser.add_argument('--refresh-treeinfo', action='store_true')
 # I am aware this is confusing, I want podman to be the default option
 parser.add_argument('--simple', action='store_false')
 parser.add_argument('--logger', type=str)
+parser.add_argument('--disable-gpg-check', action='store_false')
+parser.add_argument('--disable-repo-gpg-check', action='store_false')
+parser.add_argument('--clean-old-packages', action='store_true')
 
 # Parse them
 results = parser.parse_args()
@@ -54,6 +57,9 @@ a = RepoSync(
         logger=results.logger,
         refresh_extra_files=results.refresh_extra_files,
         refresh_treeinfo=results.refresh_treeinfo,
+        gpg_check=results.disable_gpg_check,
+        repo_gpg_check=results.disable_repo_gpg_check,
+        reposync_clean_old=results.clean_old_packages,
 )
 
 def run():
diff --git a/iso/empanadas/empanadas/scripts/sync_sig.py b/iso/empanadas/empanadas/scripts/sync_sig.py
index 3de8479..1cfb70f 100755
--- a/iso/empanadas/empanadas/scripts/sync_sig.py
+++ b/iso/empanadas/empanadas/scripts/sync_sig.py
@@ -15,7 +15,7 @@ parser = argparse.ArgumentParser(description="Peridot Sync and Compose")
 # All of our options
 parser.add_argument('--release', type=str, help="Major Release Version", required=True)
 parser.add_argument('--repo', type=str, help="Repository name")
-parser.add_argument('--sig', type=str, help="SIG name")
+parser.add_argument('--sig', type=str, help="SIG name", required=True)
 parser.add_argument('--arch', type=str, help="Architecture")
 parser.add_argument('--ignore-debug', action='store_true')
 parser.add_argument('--ignore-source', action='store_true')
@@ -25,9 +25,13 @@ parser.add_argument('--hashed', action='store_true')
 parser.add_argument('--dry-run', action='store_true')
 parser.add_argument('--full-run', action='store_true')
 parser.add_argument('--no-fail', action='store_true')
+parser.add_argument('--refresh-extra-files', action='store_true')
 # I am aware this is confusing, I want podman to be the default option
 parser.add_argument('--simple', action='store_false')
 parser.add_argument('--logger', type=str)
+parser.add_argument('--disable-gpg-check', action='store_false')
+parser.add_argument('--disable-repo-gpg-check', action='store_false')
+parser.add_argument('--clean-old-packages', action='store_true')
 
 # Parse them
 results = parser.parse_args()
@@ -46,6 +50,7 @@ a = SigRepoSync(
         repo=results.repo,
         arch=results.arch,
         ignore_source=results.ignore_source,
+        ignore_debug=results.ignore_debug,
         repoclosure=results.repoclosure,
         skip_all=results.skip_all,
         hashed=results.hashed,
@@ -53,7 +58,11 @@ a = SigRepoSync(
         dryrun=results.dry_run,
         fullrun=results.full_run,
         nofail=results.no_fail,
-        logger=results.logger
+        refresh_extra_files=results.refresh_extra_files,
+        logger=results.logger,
+        gpg_check=results.disable_gpg_check,
+        repo_gpg_check=results.disable_repo_gpg_check,
+        reposync_clean_old=results.clean_old_packages,
 )
 
 
diff --git a/iso/empanadas/empanadas/sig/altarch.yaml b/iso/empanadas/empanadas/sig/altarch.yaml
index 50c425a..f3895f7 100644
--- a/iso/empanadas/empanadas/sig/altarch.yaml
+++ b/iso/empanadas/empanadas/sig/altarch.yaml
@@ -1,17 +1,43 @@
 ---
 altarch:
   '8':
-    rockyrpi:
-      allowed_arches:
-        - aarch64
-      project_id: ''
-      additional_dirs:
-        - 'images'
+    profile: 'altarch'
+    project_id: 'a1aac235-dd66-4d5b-8ff0-87467732f322'
+    repo:
+      altarch-common:
+        allowed_arches:
+          - aarch64
+      altarch-rockyrpi:
+        allowed_arches:
+          - aarch64
+    additional_dirs:
+      - 'images'
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-altarch.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r8/'
+      branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
   '9':
-    rockyrpi:
-      allowed_arches:
-        - aarch64
-      project_id: ''
-      additional_dirs:
-        - 'images'
+    profile: 'altarch'
+    project_id: '6047887d-a395-4bc7-a0bd-fc1873b5d13d'
+    repo:
+      altarch-common:
+        allowed_arches:
+          - aarch64
+      altarch-rockyrpi:
+        allowed_arches:
+          - aarch64
+    additional_dirs:
+      - 'images'
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-altarch.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r9/'
+      branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
 ...
diff --git a/iso/empanadas/empanadas/sig/cloud.yaml b/iso/empanadas/empanadas/sig/cloud.yaml
index e0ad17a..1534591 100644
--- a/iso/empanadas/empanadas/sig/cloud.yaml
+++ b/iso/empanadas/empanadas/sig/cloud.yaml
@@ -2,16 +2,17 @@
 cloud:
   '8':
     profile: 'cloud'
-    cloud-kernel:
-      project_id: 'f91da90d-5bdb-4cf2-80ea-e07f8dae5a5c'
-      allowed_arches:
-        - aarch64
-        - x86_64
-    cloud-common:
-      allowed_arches:
-        - aarch64
-        - x86_64
-      project_id: 'f91da90d-5bdb-4cf2-80ea-e07f8dae5a5c'
+    project_id: 'f91da90d-5bdb-4cf2-80ea-e07f8dae5a5c'
+    addtional_dirs: []
+    repo:
+      cloud-kernel:
+        allowed_arches:
+          - aarch64
+          - x86_64
+      cloud-common:
+        allowed_arches:
+          - aarch64
+          - x86_64
     extra_files:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-cloud.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r8/'
@@ -21,18 +22,28 @@ cloud:
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
   '9':
-    cloud-kernel:
-      project_id: ''
-      allowed_arches:
-        - aarch64
-        - x86_64
-        - ppc64le
-        - s390x
-    cloud-common:
-      project_id: ''
-      allowed_arches:
-        - aarch64
-        - x86_64
-        - ppc64le
-        - s390x
+    profile: 'cloud'
+    project_id: '15016370-1410-4459-a1a2-a1576041fd19'
+    addtional_dirs: []
+    repo:
+      cloud-kernel:
+        allowed_arches:
+          - aarch64
+          - x86_64
+          - ppc64le
+          - s390x
+      cloud-common:
+        allowed_arches:
+          - aarch64
+          - x86_64
+          - ppc64le
+          - s390x
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-cloud.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r9/'
+      branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
 ...
diff --git a/iso/empanadas/empanadas/sig/core.yaml b/iso/empanadas/empanadas/sig/core.yaml
index b8a97fd..1a3573e 100644
--- a/iso/empanadas/empanadas/sig/core.yaml
+++ b/iso/empanadas/empanadas/sig/core.yaml
@@ -1,13 +1,49 @@
 ---
 core:
   '8':
-    core-common:
-      project_id: ''
-    core-infra:
-      project_id: ''
+    profile: 'core'
+    project_id: ''
+    addtional_dirs: []
+    repo:
+      core-common:
+        allowed_arches:
+          - x86_64
+          - aarch64
+      core-infra:
+        allowed_arches:
+          - x86_64
+          - aarch64
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-core.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r8/'
+      branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
   '9':
-    core-common:
-      project_id: ''
-    core-infra:
-      project_id: ''
+    profile: 'core'
+    project_id: ''
+    addtional_dirs: []
+    repo:
+      core-common:
+        allowed_arches:
+          - x86_64
+          - aarch64
+          - ppc64le
+          - s390x
+      core-infra:
+        allowed_arches:
+          - x86_64
+          - aarch64
+          - ppc64le
+          - s390x
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-core.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r9/'
+      branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
 ...
diff --git a/iso/empanadas/empanadas/sig/desktop.yaml b/iso/empanadas/empanadas/sig/desktop.yaml
new file mode 100644
index 0000000..8af70d6
--- /dev/null
+++ b/iso/empanadas/empanadas/sig/desktop.yaml
@@ -0,0 +1,37 @@
+---
+desktop:
+  '8':
+    profile: 'desktop'
+    project_id: '8b3c9b53-0633-47bd-98a3-1ca3ec141278'
+    addtional_dirs: []
+    repo:
+      desktop-common:
+        allowed_arches:
+          - x86_64
+          - aarch64
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-desktop.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-desktop/-/raw/r8/'
+      branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
+  '9':
+    profile: 'desktop'
+    project_id: 'b0460c25-22cf-496c-a3a3-067b9a2af14a'
+    addtional_dirs: []
+    repo:
+      desktop-common:
+        allowed_arches:
+          - x86_64
+          - aarch64
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-desktop.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-desktop/-/raw/r9/'
+      branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
+...
diff --git a/iso/empanadas/empanadas/sig/virt.yaml b/iso/empanadas/empanadas/sig/virt.yaml
new file mode 100644
index 0000000..083ded4
--- /dev/null
+++ b/iso/empanadas/empanadas/sig/virt.yaml
@@ -0,0 +1,38 @@
+---
+virt:
+  '8':
+    profile: 'virt'
+    project_id: 'd911867a-658e-4f41-8343-5ceac6c41f67'
+    addtional_dirs: []
+    repo:
+      virt-common:
+        allowed_arches:
+          - x86_64
+          - aarch64
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-virt.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-virt/-/raw/r8/'
+      branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
+  '9':
+    profile: 'virt'
+    project_id: '925ceece-47ce-4f51-90f7-ff8689e4fe5e'
+    addtional_dirs: []
+    repo:
+      virt-common:
+        allowed_arches:
+          - x86_64
+          - aarch64
+          - ppc64le
+    extra_files:
+      git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-virt.git'
+      git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-virt/-/raw/r9/'
+      branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
+      list:
+        - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
+...
diff --git a/iso/empanadas/empanadas/templates/ISOREADME.tmpl b/iso/empanadas/empanadas/templates/ISOREADME.tmpl
new file mode 100644
index 0000000..19ad140
--- /dev/null
+++ b/iso/empanadas/empanadas/templates/ISOREADME.tmpl
@@ -0,0 +1,41 @@
+This directory contains ISO's for the {{ arch }} architecture. You will see
+multiple types of ISO's, including accompanying manifests and CHECKSUM files
+that match the given ISO. You will see the following formats:
+
+* Rocky-X.Y-ARCH-TYPE       (ISO File)
+* Rocky-X.Y-DATE-ARCH-TYPE  (ISO File)
+* Rocky-ARCH-TYPE           (Symlink)
+
+X will be the major release.
+Y will be the minor release.
+ARCH is the given architecture.
+DATE will be the date the ISO was built (if applicable)
+TYPE will be the type of ISO (boot, dvd, minimal)
+
+The first format is the most common and is the day-of-release ISO.
+
+The second format is in the case of rebuilt ISO's, in the case of addressing
+a bug or providing an updated image (eg for a newer kernel, a newer secure
+boot shim, and so on).
+
+The third format in the list is a symlink to the "latest" ISO. Currently, this
+is not advertised on the main site, but there may be potential for this in
+the future as a value add.
+
+This is "unversioned" ISO symlink is for these cases:
+
+* A pre-determined download location for users/mirrors/service providers who
+  want an always available and deterministic download location, which can be
+  easier to script
+
+* osinfo database / libvirt use where if a user selects Rocky Linux X, it
+  should be aware of and be able to download from that location. This should
+  be fully supported in Rocky Linux 8.7 and 9.1, and future Fedora versions.
+
+If you have any questions, please reach out to us:
+
+* https://chat.rockylinux.org ~Development, ~Infrastructure, ~General
+* https://forums.rockylinux.org
+* https://lists.resf.org/mailman3/lists/rocky.lists.resf.org/        - Rocky General Mail List
+* https://lists.resf.org/mailman3/lists/rocky-mirror.lists.resf.org/ - Mirror Mail List
+
diff --git a/iso/empanadas/empanadas/templates/README.tmpl b/iso/empanadas/empanadas/templates/README.tmpl
index ea4ec00..1c9f866 100644
--- a/iso/empanadas/empanadas/templates/README.tmpl
+++ b/iso/empanadas/empanadas/templates/README.tmpl
@@ -11,6 +11,15 @@ metadata provides.
 
 # Notes #
 
+## Unversioned ISO Files ##
+
+There are unversioned ISO files in the isos and live directories per
+architecture. This is to allow libvirt users an easy way to download an ISO for
+a given release of their choosing easily. It also allows users as a whole to
+always have a pre-determined path to download the latest ISO of a given release
+by just relying on it being in the URL itself rather than in the ISO name. Note
+that these unversioned ISO files may or may not advertised on the main site.
+
 ## Checksums ##
 
 CHECKSUM Validation: https://github.com/rocky-linux/checksums
diff --git a/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh b/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
index fbac286..cbb6c5f 100644
--- a/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
+++ b/iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
@@ -23,3 +23,9 @@ fi
 
 {{ make_manifest }}
 
+{% if extra_iso_mode == "podman" %}
+# symlink to unversioned image name
+ln -sf {{ isoname }} {{ generic_isoname }}
+ln -sf {{ isoname }}.manifest {{ generic_isoname }}.manifest
+
+{% endif %}
diff --git a/iso/empanadas/empanadas/templates/buildImage.tmpl.sh b/iso/empanadas/empanadas/templates/buildImage.tmpl.sh
index 817d73b..3a8d983 100644
--- a/iso/empanadas/empanadas/templates/buildImage.tmpl.sh
+++ b/iso/empanadas/empanadas/templates/buildImage.tmpl.sh
@@ -53,6 +53,8 @@ elif [ -f "/usr/bin/isoinfo" ]; then
       grep -v '/TRANS.TBL$' | sort >> lorax/images/boot.iso.manifest
 fi
 
+find lorax -perm 700 -exec chmod 755 {} \;
+
 tar czf "${LORAX_TAR}" lorax "${LOGFILE}"
 
 tar_ret_val=$?
diff --git a/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh b/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh
index 841987a..a2bd4d0 100644
--- a/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh
+++ b/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh
@@ -18,9 +18,9 @@ cd /builddir
 
 {{ git_clone }}
 if [ -d "/builddir/ks/live/{{ major }}/peridot" ]; then
-  pushd /builddir/ks/live/{{ major }}/peridot || { echo "Could not change directory"; exit 1; }
+  pushd /builddir/ks/live/{{ major }}/{{ arch }}/peridot || { echo "Could not change directory"; exit 1; }
 else
-  pushd /builddir/ks/live/{{ major }}/staging || { echo "Could not change directory"; exit 1; }
+  pushd /builddir/ks/live/{{ major }}/{{ arch }}/stage   || { echo "Could not change directory"; exit 1; }
 fi
 ksflatten -c {{ ks_file }} -o /builddir/ks.cfg
 if [ $? -ne 0 ]; then
diff --git a/iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl b/iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl
new file mode 100644
index 0000000..1297d90
--- /dev/null
+++ b/iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl
@@ -0,0 +1,21 @@
+<template>
+  <name>Rocky-{{major}}-{{type}}-{{version_variant}}.{{iso8601date}}.{{release}}.{{architecture}}</name>
+        <os>
+            <name>Fedora</name>
+            <version>{{fedora_major}}</version>
+            <arch>{{architecture}}</arch>
+            <install type='url'>
+              <url>https://download.rockylinux.org/stg/rocky/{{major}}/BaseOS/{{architecture}}/{{installdir}}</url>
+            </install>
+            <icicle>
+                <extra_command>rpm -qa --qf '%{NAME},%{VERSION},%{RELEASE},%{ARCH},%{EPOCH},%{SIZE},%{SIGMD5},%{BUILDTIME}\n'</extra_command>
+            </icicle>
+            <kernelparam>console=tty0 inst.usefbx</kernelparam>
+        </os>
+        <description>Rocky-{{major}}-{{type}}-{{version_variant}}.{{iso8601date}}.{{release}}.{{architecture}} Generated on {{utcnow}}</description>
+    <disk>
+      <size>{{size}}</size>
+    </disk>
+</template>
+
+
diff --git a/iso/empanadas/empanadas/templates/icicle/tdl.xml.tmpl b/iso/empanadas/empanadas/templates/icicle/tdl.xml.tmpl
index 5ba9c6d..93016ea 100644
--- a/iso/empanadas/empanadas/templates/icicle/tdl.xml.tmpl
+++ b/iso/empanadas/empanadas/templates/icicle/tdl.xml.tmpl
@@ -10,7 +10,6 @@
             <icicle>
                 <extra_command>rpm -qa --qf '%{NAME},%{VERSION},%{RELEASE},%{ARCH},%{EPOCH},%{SIZE},%{SIGMD5},%{BUILDTIME}\n'</extra_command>
             </icicle>
-            <kernelparam>console=tty0 inst.usefbx</kernelparam>
         </os>
         <description>Rocky-{{major}}-{{type}}-{{version_variant}}.{{iso8601date}}.{{release}}.{{architecture}} Generated on {{utcnow}}</description>
     <disk>
diff --git a/iso/empanadas/empanadas/templates/repoconfig.tmpl b/iso/empanadas/empanadas/templates/repoconfig.tmpl
index d322929..248ee48 100644
--- a/iso/empanadas/empanadas/templates/repoconfig.tmpl
+++ b/iso/empanadas/empanadas/templates/repoconfig.tmpl
@@ -3,24 +3,24 @@
 name={{repo.name}}
 baseurl={{ repo.baseurl }}
 enabled=1
-gpgcheck=1
-repo_gpgcheck=1
+gpgcheck={{ gpg_check }}
+repo_gpgcheck={{ repo_gpg_check }}
 gpgkey={{ repo.gpgkey }}
 
 [{{ repo.name }}-debug]
 name={{repo.name}}
 baseurl={{ repo.baseurl }}-debug
 enabled=1
-gpgcheck=1
-repo_gpgcheck=1
+gpgcheck={{ gpg_check }}
+repo_gpgcheck={{ repo_gpg_check }}
 gpgkey={{ repo.gpgkey }}
 
 [{{ repo.name }}-source]
 name={{repo.name}}
 baseurl={{ repo.srcbaseurl }}
 enabled=1
-gpgcheck=1
-repo_gpgcheck=1
+gpgcheck={{ gpg_check }}
+repo_gpgcheck={{ repo_gpg_check }}
 gpgkey={{ repo.gpgkey }}
 
 {% endfor %}
diff --git a/iso/empanadas/empanadas/templates/reposync-src.tmpl b/iso/empanadas/empanadas/templates/reposync-src.tmpl
index 3758643..59779f0 100644
--- a/iso/empanadas/empanadas/templates/reposync-src.tmpl
+++ b/iso/empanadas/empanadas/templates/reposync-src.tmpl
@@ -3,6 +3,7 @@ set -o pipefail
 {{ import_gpg_cmd }} | tee -a {{ sync_log }}
 {{ dnf_plugin_cmd }} | tee -a {{ sync_log }}
 sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/*.repo
+{{ metadata_cmd }} | tee -a {{ sync_log }}
 {{ sync_cmd }} | tee -a {{ sync_log }}
 
 # Yes this is a bit hacky. Can't think of a better way to do this.
@@ -18,8 +19,13 @@ if [ "$ret_val" -eq 0 ]; then
     echo "SOME PACKAGES DID NOT DOWNLOAD" | tee -a {{ sync_log }}
     exit 1
   else
+{% if deploy_extra_files %}
+    pushd {{ download_path }}
+    curl -RO {{ gpg_key_url }}
+    popd
+{% endif %}
     exit 0
   fi
 fi
 
-# {{ check_cmd  }} | tee -a {{ sync_log }}
+# {{ check_cmd }} | tee -a {{ sync_log }}
diff --git a/iso/empanadas/empanadas/templates/reposync.tmpl b/iso/empanadas/empanadas/templates/reposync.tmpl
index 0709b6f..c0092db 100644
--- a/iso/empanadas/empanadas/templates/reposync.tmpl
+++ b/iso/empanadas/empanadas/templates/reposync.tmpl
@@ -4,6 +4,7 @@ set -o pipefail
 {{ arch_force_cp }} | tee -a {{ sync_log }}
 {{ dnf_plugin_cmd }} | tee -a {{ sync_log }}
 sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/*.repo
+{{ metadata_cmd }} | tee -a {{ sync_log }}
 {{ sync_cmd }} | tee -a {{ sync_log }}
 
 # Yes this is a bit hacky. Can't think of a better way to do this.
@@ -25,6 +26,11 @@ if [ "$ret_val" -eq 0 ]; then
     #  echo "Repository is empty." | tee -a {{ sync_log }}
     #  rm -rf {{ download_path }}
     #fi
+{%- if deploy_extra_files %}
+    pushd {{ download_path }}
+    curl -RO {{ gpg_key_url }}
+    popd
+{% endif %}
     exit 0
   fi
 fi
diff --git a/iso/empanadas/empanadas/templates/xorriso.tmpl.txt b/iso/empanadas/empanadas/templates/xorriso.tmpl.txt
index 133aa11..934066b 100644
--- a/iso/empanadas/empanadas/templates/xorriso.tmpl.txt
+++ b/iso/empanadas/empanadas/templates/xorriso.tmpl.txt
@@ -1,6 +1,10 @@
 -indev {{ boot_iso }}
 -outdev {{ isoname }}
 -boot_image any replay
+-joliet on
+-system_id {{ 'PPC' if arch == 'ppc64le' else 'LINUX' }}
+-compliance joliet_long_names
+{{ '-compliance untranslated_names' if arch == 'ppc64le' }}
 -volid {{ volid }}
 {{ graft }}
 -end
diff --git a/iso/empanadas/empanadas/util/dnf_utils.backup b/iso/empanadas/empanadas/util/dnf_utils.backup
new file mode 100644
index 0000000..3d66aae
--- /dev/null
+++ b/iso/empanadas/empanadas/util/dnf_utils.backup
@@ -0,0 +1,1663 @@
+"""
+Syncs yum repos for mirroring and composing.
+
+Louis Abel <label AT rockylinux.org>
+"""
+#import shutil
+import logging
+import sys
+import os
+import os.path
+import subprocess
+import shlex
+import shutil
+import time
+import re
+import json
+import glob
+#import pipes
+
+from jinja2 import Environment, FileSystemLoader
+
+import empanadas
+from empanadas.common import Color, _rootdir
+from empanadas.util import Shared
+
+# initial treeinfo data is made here
+import productmd.treeinfo
+
+#HAS_LIBREPO = True
+#try:
+#    import librepo
+#except:
+#    HAS_LIBREPO = False
+
+class RepoSync:
+    """
+    This helps us do reposync operations for the base system. SIG syncs are a
+    different class entirely. This is on purpose. Please use the SigRepoSync
+    class for SIG syncs.
+    """
+    def __init__(
+            self,
+            rlvars,
+            config,
+            major,
+            repo=None,
+            arch=None,
+            ignore_debug: bool = False,
+            ignore_source: bool = False,
+            repoclosure: bool = False,
+            refresh_extra_files: bool = False,
+            refresh_treeinfo: bool = False,
+            skip_all: bool = False,
+            hashed: bool = False,
+            parallel: bool = False,
+            dryrun: bool = False,
+            fullrun: bool = False,
+            nofail: bool = False,
+            gpgkey: str = 'stable',
+            rlmode: str = 'stable',
+            just_pull_everything: bool = False,
+            logger=None
+        ):
+        self.nofail = nofail
+        self.dryrun = dryrun
+        self.fullrun = fullrun
+        self.arch = arch
+        self.ignore_debug = ignore_debug
+        self.ignore_source = ignore_source
+        self.skip_all = skip_all
+        self.hashed = hashed
+        self.repoclosure = repoclosure
+        self.refresh_extra_files = refresh_extra_files
+        self.refresh_treeinfo = refresh_treeinfo
+        # Enables podman syncing, which should effectively speed up operations
+        self.parallel = parallel
+        # This makes it so every repo is synced at the same time.
+        # This is EXTREMELY dangerous.
+        self.just_pull_everything = just_pull_everything
+        # Relevant config items
+        self.major_version = major
+        self.date_stamp = config['date_stamp']
+        self.timestamp = time.time()
+        self.repo_base_url = config['repo_base_url']
+        self.compose_root = config['compose_root']
+        self.compose_base = config['compose_root'] + "/" + major
+        self.profile = rlvars['profile']
+        self.iso_map = rlvars['iso_map']
+        self.distname = config['distname']
+        self.fullname = rlvars['fullname']
+        self.shortname = config['shortname']
+
+        # Relevant major version items
+        self.shortname = config['shortname']
+        self.revision = rlvars['revision'] + "-" + rlvars['rclvl']
+        self.fullversion = rlvars['revision']
+        self.arches = rlvars['allowed_arches']
+        self.project_id = rlvars['project_id']
+        self.repo_renames = rlvars['renames']
+        self.repos = rlvars['all_repos']
+        self.multilib = rlvars['provide_multilib']
+        self.repo = repo
+        self.extra_files = rlvars['extra_files']
+        self.gpgkey = gpgkey
+        self.checksum = rlvars['checksum']
+
+        self.compose_id = '{}-{}-{}'.format(
+                config['shortname'],
+                rlvars['revision'],
+                config['date_stamp']
+        )
+
+        # Templates
+        file_loader = FileSystemLoader(f"{_rootdir}/templates")
+        self.tmplenv = Environment(loader=file_loader)
+
+        # each el can have its own designated container to run stuff in,
+        # otherwise we'll just default to the default config.
+        self.container = config['container']
+        if 'container' in rlvars and len(rlvars['container']) > 0:
+            self.container = rlvars['container']
+
+        if 'repoclosure_map' in rlvars and len(rlvars['repoclosure_map']) > 0:
+            self.repoclosure_map = rlvars['repoclosure_map']
+
+        self.staging_dir = os.path.join(
+                    config['staging_root'],
+                    config['category_stub'],
+                    self.revision
+        )
+
+        self.compose_latest_dir = os.path.join(
+                config['compose_root'],
+                major,
+                "latest-{}-{}".format(
+                    self.shortname,
+                    self.profile
+                )
+        )
+
+        self.compose_latest_sync = os.path.join(
+                self.compose_latest_dir,
+                "compose"
+        )
+
+        self.compose_log_dir = os.path.join(
+                self.compose_latest_dir,
+                "work/logs"
+        )
+
+        self.compose_global_work_root = os.path.join(
+                self.compose_latest_dir,
+                "work/global"
+        )
+
+        # This is temporary for now.
+        if logger is None:
+            self.log = logging.getLogger("reposync")
+            self.log.setLevel(logging.INFO)
+            handler = logging.StreamHandler(sys.stdout)
+            handler.setLevel(logging.INFO)
+            formatter = logging.Formatter(
+                    '%(asctime)s :: %(name)s :: %(message)s',
+                    '%Y-%m-%d %H:%M:%S'
+            )
+            handler.setFormatter(formatter)
+            self.log.addHandler(handler)
+
+        self.log.info('reposync init')
+        self.log.info(self.revision)
+
+        # The repo name should be valid
+        if self.repo is not None:
+            if self.repo not in self.repos:
+                self.log.error(Color.FAIL + 'Invalid repository: ' + self.repo)
+                raise SystemExit()
+
+    def run(self):
+        """
+        This must be called to perform the sync. This will run through, create
+        the configuration file as required, and try to do a sync of every repo
+        applicable or the repo actually specified. If self.repo is None, it
+        will be assumed all repos are synced as dictated by rlvars.
+
+         * Dry runs only create initial directories and structure
+         * Full runs sync everything from the top and setup structure,
+           including creating a symlink to latest-Rocky-X and creating the
+           kickstart directories
+         * self.repo is ignored during full runs (noted in stdout)
+         * self.arch being set will force only that arch to sync
+        """
+        if self.fullrun and self.repo:
+            self.log.error('WARNING: repo ignored when doing a full sync')
+        if self.fullrun and self.dryrun:
+            self.log.error('A full and dry run is currently not supported.')
+            raise SystemExit('\nA full and dry run is currently not supported.')
+
+        # This should create the initial compose dir and set the path.
+        # Otherwise, just use the latest link.
+        if self.fullrun:
+            generated_dir = Shared.generate_compose_dirs(
+                    self.compose_base,
+                    self.shortname,
+                    self.fullversion,
+                    self.date_stamp,
+                    self.log
+            )
+            work_root = os.path.join(
+                    generated_dir,
+                    'work'
+            )
+            sync_root = os.path.join(
+                    generated_dir,
+                    'compose'
+            )
+        else:
+            # Put in a verification here.
+            work_root = os.path.join(
+                    self.compose_latest_dir,
+                    'work'
+            )
+            sync_root = self.compose_latest_sync
+
+            # Verify if the link even exists
+            if not os.path.exists(self.compose_latest_dir):
+                self.log.error('!! Latest compose link is broken does not exist: %s' % self.compose_latest_dir)
+                self.log.error('!! Please perform a full run if you have not done so.')
+                raise SystemExit()
+
+        log_root = os.path.join(
+                work_root,
+                "logs",
+                self.date_stamp
+        )
+
+        global_work_root = os.path.join(
+                work_root,
+                "global",
+        )
+
+        self.dnf_config = Shared.generate_conf(
+                self.shortname,
+                self.major_version,
+                self.repos,
+                self.repo_base_url,
+                self.project_id,
+                self.hashed,
+                self.extra_files,
+                self.gpgkey,
+                self.tmplenv,
+                self.log
+        )
+
+        if self.dryrun:
+            self.log.error('Dry Runs are not supported just yet. Sorry!')
+            raise SystemExit()
+
+        if self.fullrun and self.refresh_extra_files:
+            self.log.warn(Color.WARN + 'A full run implies extra files are also deployed.')
+
+        self.sync(self.repo, sync_root, work_root, log_root, global_work_root, self.arch)
+
+        if self.fullrun:
+            self.deploy_extra_files(sync_root, global_work_root)
+            self.deploy_treeinfo(self.repo, sync_root, self.arch)
+            self.tweak_treeinfo(self.repo, sync_root, self.arch)
+            self.symlink_to_latest(generated_dir)
+
+        if self.repoclosure:
+            self.repoclosure_work(sync_root, work_root, log_root)
+
+        if self.refresh_extra_files and not self.fullrun:
+            self.deploy_extra_files(sync_root, global_work_root)
+
+        # deploy_treeinfo does NOT overwrite any treeinfo files. However,
+        # tweak_treeinfo calls out to a method that does. This should not
+        # cause issues as the method is fairly static in nature.
+        if self.refresh_treeinfo and not self.fullrun:
+            self.deploy_treeinfo(self.repo, sync_root, self.arch)
+            self.tweak_treeinfo(self.repo, sync_root, self.arch)
+
+        self.deploy_metadata(sync_root)
+
+        self.log.info('Compose repo directory: %s' % sync_root)
+        self.log.info('Compose logs: %s' % log_root)
+        self.log.info('Compose completed.')
+
+    def sync(self, repo, sync_root, work_root, log_root, global_work_root, arch=None):
+        """
+        Calls out syncing of the repos. We generally sync each component of a
+        repo:
+            * each architecture
+            * each architecture debug
+            * each source
+
+        If parallel is true, we will run in podman.
+        """
+        if self.parallel:
+            self.podman_sync(repo, sync_root, work_root, log_root, global_work_root, arch)
+        else:
+            self.dnf_sync(repo, sync_root, work_root, arch)
+
+    def dnf_sync(self, repo, sync_root, work_root, arch):
+        """
+        This is for normal dnf syncs. This is very slow.
+        """
+        self.log.error('DNF syncing has been removed.')
+        self.log.error('Please install podman and enable parallel')
+        raise SystemExit()
+
+    def podman_sync(
+            self,
+            repo,
+            sync_root,
+            work_root,
+            log_root,
+            global_work_root,
+            arch
+        ):
+        """
+        This is for podman syncs
+
+        Create sync_root/work/entries
+        Generate scripts as needed into dir
+        Each container runs their own script
+        wait till all is finished
+        """
+        cmd = Shared.podman_cmd(self.log)
+        contrunlist = []
+        bad_exit_list = []
+        self.log.info('Generating container entries')
+        entries_dir = os.path.join(work_root, "entries")
+        if not os.path.exists(entries_dir):
+            os.makedirs(entries_dir, exist_ok=True)
+
+        # yeah, I know.
+        if not os.path.exists(global_work_root):
+            os.makedirs(global_work_root, exist_ok=True)
+
+        if not os.path.exists(log_root):
+            os.makedirs(log_root, exist_ok=True)
+
+        sync_single_arch = False
+        arches_to_sync = self.arches
+        if arch:
+            sync_single_arch = True
+            arches_to_sync = [arch]
+
+        sync_single_repo = False
+        repos_to_sync = self.repos
+        if repo and not self.fullrun:
+            sync_single_repo = True
+            repos_to_sync = [repo]
+
+        for r in repos_to_sync:
+            entry_name_list = []
+            repo_name = r
+            arch_sync = arches_to_sync.copy()
+
+            if r in self.repo_renames:
+                repo_name = self.repo_renames[r]
+
+            # Sync all if arch is x86_64 and multilib is true
+            if 'all' in r and 'x86_64' in arches_to_sync and self.multilib:
+                arch_sync.append('i686')
+
+            for a in arch_sync:
+                entry_name = '{}-{}'.format(r, a)
+                debug_entry_name = '{}-debug-{}'.format(r, a)
+
+                entry_name_list.append(entry_name)
+
+                if not self.ignore_debug and not a == 'source':
+                    entry_name_list.append(debug_entry_name)
+
+                entry_point_sh = os.path.join(
+                        entries_dir,
+                        entry_name
+                )
+
+                debug_entry_point_sh = os.path.join(
+                        entries_dir,
+                        debug_entry_name
+                )
+
+                os_sync_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'os'
+                )
+
+                debug_sync_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'debug/tree'
+                )
+
+                import_gpg_cmd = ("/usr/bin/rpm --import {}{}").format(
+                        self.extra_files['git_raw_path'],
+                        self.extra_files['gpg'][self.gpgkey]
+                )
+
+                arch_force_cp = ("/usr/bin/sed 's|$basearch|{}|g' {} > {}.{}".format(
+                    a,
+                    self.dnf_config,
+                    self.dnf_config,
+                    a
+                ))
+
+                sync_log = ("{}/{}-{}.log").format(
+                        log_root,
+                        repo_name,
+                        a
+                )
+
+                debug_sync_log = ("{}/{}-{}-debug.log").format(
+                        log_root,
+                        repo_name,
+                        a
+                )
+
+                metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={} "
+                        "--forcearch {} --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        a
+                )
+
+                sync_cmd = ("/usr/bin/dnf reposync -c {}.{} --download-metadata "
+                        "--repoid={} -p {} --forcearch {} --norepopath --remote-time "
+                        "--gpgcheck --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        os_sync_path,
+                        a
+                )
+
+                debug_metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={}-debug "
+                        "--forcearch {} --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        a
+                )
+
+
+                debug_sync_cmd = ("/usr/bin/dnf reposync -c {}.{} "
+                        "--download-metadata --repoid={}-debug -p {} --forcearch {} "
+                        "--gpgcheck --norepopath --remote-time --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        debug_sync_path,
+                        a
+                )
+
+                dnf_plugin_cmd = "/usr/bin/dnf install dnf-plugins-core -y"
+
+                sync_template = self.tmplenv.get_template('reposync.tmpl')
+                sync_output = sync_template.render(
+                        import_gpg_cmd=import_gpg_cmd,
+                        arch_force_cp=arch_force_cp,
+                        dnf_plugin_cmd=dnf_plugin_cmd,
+                        sync_cmd=sync_cmd,
+                        metadata_cmd=metadata_cmd,
+                        sync_log=sync_log,
+                        download_path=os_sync_path
+                )
+
+                debug_sync_template = self.tmplenv.get_template('reposync.tmpl')
+                debug_sync_output = debug_sync_template.render(
+                        import_gpg_cmd=import_gpg_cmd,
+                        arch_force_cp=arch_force_cp,
+                        dnf_plugin_cmd=dnf_plugin_cmd,
+                        sync_cmd=debug_sync_cmd,
+                        metadata_cmd=debug_metadata_cmd,
+                        sync_log=debug_sync_log,
+                        download_path=debug_sync_path
+                )
+
+                entry_point_open = open(entry_point_sh, "w+")
+                debug_entry_point_open = open(debug_entry_point_sh, "w+")
+
+                entry_point_open.write(sync_output)
+                debug_entry_point_open.write(debug_sync_output)
+
+                entry_point_open.close()
+                debug_entry_point_open.close()
+
+                os.chmod(entry_point_sh, 0o755)
+                os.chmod(debug_entry_point_sh, 0o755)
+
+                # During fullruns, a kickstart directory is made. Kickstart
+                # should not be updated nor touched during regular runs under
+                # any circumstances.
+                if self.fullrun:
+                    ks_entry_name = '{}-ks-{}'.format(r, a)
+                    entry_name_list.append(ks_entry_name)
+                    ks_point_sh = os.path.join(
+                            entries_dir,
+                            ks_entry_name
+                    )
+
+                    ks_sync_path = os.path.join(
+                            sync_root,
+                            repo_name,
+                            a,
+                            'kickstart'
+                    )
+
+                    ks_metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={} "
+                            "--forcearch {} --assumeyes 2>&1").format(
+                            self.dnf_config,
+                            a,
+                            r,
+                            a
+                    )
+
+                    ks_sync_cmd = ("/usr/bin/dnf reposync -c {}.{} --download-metadata "
+                            "--repoid={} -p {} --forcearch {} --norepopath "
+                            "--gpgcheck --assumeyes --remote-time 2>&1").format(
+                            self.dnf_config,
+                            a,
+                            r,
+                            ks_sync_path,
+                            a
+                    )
+
+                    ks_sync_log = ("{}/{}-{}-ks.log").format(
+                            log_root,
+                            repo_name,
+                            a
+                    )
+
+                    ks_sync_template = self.tmplenv.get_template('reposync.tmpl')
+                    ks_sync_output = ks_sync_template.render(
+                            import_gpg_cmd=import_gpg_cmd,
+                            arch_force_cp=arch_force_cp,
+                            dnf_plugin_cmd=dnf_plugin_cmd,
+                            sync_cmd=ks_sync_cmd,
+                            metadata_cmd=ks_metadata_cmd,
+                            sync_log=ks_sync_log
+                    )
+                    ks_entry_point_open = open(ks_point_sh, "w+")
+                    ks_entry_point_open.write(ks_sync_output)
+                    ks_entry_point_open.close()
+                    os.chmod(ks_point_sh, 0o755)
+
+            # We ignoring sources?
+            if (not self.ignore_source and not arch) or (
+                    not self.ignore_source and arch == 'source'):
+                source_entry_name = '{}-source'.format(r)
+                entry_name_list.append(source_entry_name)
+
+                source_entry_point_sh = os.path.join(
+                        entries_dir,
+                        source_entry_name
+                )
+
+                source_sync_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        'source/tree'
+                )
+
+                source_sync_log = ("{}/{}-source.log").format(
+                        log_root,
+                        repo_name
+                )
+
+                source_metadata_cmd = ("/usr/bin/dnf makecache -c {} --repoid={}-source "
+                        "--assumeyes 2>&1").format(
+                        self.dnf_config,
+                        r
+                )
+
+                source_sync_cmd = ("/usr/bin/dnf reposync -c {} "
+                        "--download-metadata --repoid={}-source -p {} "
+                        "--gpgcheck --norepopath --remote-time --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        r,
+                        source_sync_path
+                )
+
+                source_sync_template = self.tmplenv.get_template('reposync-src.tmpl')
+                source_sync_output = source_sync_template.render(
+                        import_gpg_cmd=import_gpg_cmd,
+                        dnf_plugin_cmd=dnf_plugin_cmd,
+                        sync_cmd=source_sync_cmd,
+                        metadata_cmd=source_metadata_cmd,
+                        sync_log=source_sync_log
+                )
+
+                source_entry_point_open = open(source_entry_point_sh, "w+")
+                source_entry_point_open.write(source_sync_output)
+                source_entry_point_open.close()
+                os.chmod(source_entry_point_sh, 0o755)
+
+            # Spawn up all podman processes for repo
+            self.log.info('Starting podman processes for %s ...' % r)
+
+            #print(entry_name_list)
+            for pod in entry_name_list:
+                podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
+                        cmd,
+                        self.compose_root,
+                        self.compose_root,
+                        self.dnf_config,
+                        self.dnf_config,
+                        entries_dir,
+                        entries_dir,
+                        pod,
+                        entries_dir,
+                        pod,
+                        self.container
+                )
+                #print(podman_cmd_entry)
+                process = subprocess.call(
+                        shlex.split(podman_cmd_entry),
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                )
+
+            join_all_pods = ' '.join(entry_name_list)
+            time.sleep(3)
+            self.log.info(Color.INFO + 'Syncing ' + r + ' ...')
+            self.log.info(Color.INFO + 'Arches: ' + ' '.join(arch_sync))
+            pod_watcher = '{} wait {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            #print(pod_watcher)
+            watch_man = subprocess.call(
+                    shlex.split(pod_watcher),
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL
+            )
+
+            # After the above is done, we'll check each pod process for an exit
+            # code.
+            pattern = "Exited (0)"
+            for pod in entry_name_list:
+                checkcmd = '{} ps -f status=exited -f name={}'.format(
+                        cmd,
+                        pod
+                )
+                podcheck = subprocess.Popen(
+                        checkcmd,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        shell=True
+                )
+
+                output, errors = podcheck.communicate()
+                if 'Exited (0)' not in output.decode():
+                    self.log.error(Color.FAIL + pod)
+                    bad_exit_list.append(pod)
+
+            rmcmd = '{} rm {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            rmpod = subprocess.Popen(
+                    rmcmd,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL,
+                    shell=True
+            )
+
+            entry_name_list.clear()
+            self.log.info(Color.INFO + 'Syncing ' + r + ' completed')
+
+        if len(bad_exit_list) > 0:
+            self.log.error(
+                    Color.BOLD + Color.RED + 'There were issues syncing these '
+                    'repositories:' + Color.END
+            )
+            for issue in bad_exit_list:
+                self.log.error(issue)
+        else:
+            self.log.info(
+                    '[' + Color.BOLD + Color.GREEN + ' OK ' + Color.END + '] '
+                    'No issues detected.'
+            )
+
+    def symlink_to_latest(self, generated_dir):
+        """
+        Emulates pungi and symlinks latest-Rocky-X
+
+        This link will be what is updated in full runs. Whatever is in this
+        'latest' directory is what is rsynced on to staging after completion.
+        This link should not change often.
+        """
+        try:
+            os.remove(self.compose_latest_dir)
+        except:
+            pass
+
+        self.log.info('Symlinking to latest-{}-{}...'.format(self.shortname, self.major_version))
+        os.symlink(generated_dir, self.compose_latest_dir)
+
+    def repoclosure_work(self, sync_root, work_root, log_root):
+        """
+        This is where we run repoclosures, based on the configuration of each
+        EL version. Each major version should have a dictionary of lists that
+        point to which repos they'll be targetting. An empty list because the
+        repoclosure is ran against itself, and itself only. In the case of 8,
+        9, and perhaps 10, BaseOS is the only repo that should be checking
+        against itself. (This means BaseOS should be able to survive by
+        itself.)
+        """
+        cmd = Shared.podman_cmd(self.log)
+        entries_dir = os.path.join(work_root, "entries")
+        bad_exit_list = []
+
+        if not self.parallel:
+            self.log.error('repoclosure is too slow to run one by one. enable parallel mode.')
+            raise SystemExit()
+
+        self.log.info('Beginning repoclosure phase')
+        for repo in self.repoclosure_map['repos']:
+            if self.repo and repo not in self.repo:
+                continue
+
+            repoclosure_entry_name_list = []
+            self.log.info('Setting up repoclosure for {}'.format(repo))
+
+            for arch in self.repoclosure_map['arches']:
+                repo_combination = []
+                repoclosure_entry_name = 'repoclosure-{}-{}'.format(repo, arch)
+                repoclosure_entry_name_list.append(repoclosure_entry_name)
+                repoclosure_arch_list = self.repoclosure_map['arches'][arch]
+
+                # Some repos will have additional repos to close against - this
+                # helps append
+                if len(self.repoclosure_map['repos'][repo]) > 0:
+                    for l in self.repoclosure_map['repos'][repo]:
+                        stretch = '--repofrompath={},file://{}/{}/{}/os --repo={}'.format(
+                                l,
+                                sync_root,
+                                l,
+                                arch,
+                                l
+                        )
+                        repo_combination.append(stretch)
+
+                join_repo_comb = ' '.join(repo_combination)
+
+                repoclosure_entry_point_sh = os.path.join(
+                        entries_dir,
+                        repoclosure_entry_name
+                )
+                repoclosure_entry_point_sh = os.path.join(
+                        entries_dir,
+                        repoclosure_entry_name
+                )
+                repoclosure_cmd = ('/usr/bin/dnf repoclosure {} '
+                        '--repofrompath={},file://{}/{}/{}/os --repo={} --check={} {} '
+                        '| tee -a {}/{}-repoclosure-{}.log').format(
+                        repoclosure_arch_list,
+                        repo,
+                        sync_root,
+                        repo,
+                        arch,
+                        repo,
+                        repo,
+                        join_repo_comb,
+                        log_root,
+                        repo,
+                        arch
+                )
+                repoclosure_entry_point_open = open(repoclosure_entry_point_sh, "w+")
+                repoclosure_entry_point_open.write('#!/bin/bash\n')
+                repoclosure_entry_point_open.write('set -o pipefail\n')
+                repoclosure_entry_point_open.write('/usr/bin/dnf install dnf-plugins-core -y\n')
+                repoclosure_entry_point_open.write('/usr/bin/dnf clean all\n')
+                repoclosure_entry_point_open.write(repoclosure_cmd + '\n')
+                repoclosure_entry_point_open.close()
+                os.chmod(repoclosure_entry_point_sh, 0o755)
+                repo_combination.clear()
+
+            self.log.info('Spawning pods for %s' % repo)
+            for pod in repoclosure_entry_name_list:
+                podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
+                        cmd,
+                        self.compose_root,
+                        self.compose_root,
+                        self.dnf_config,
+                        self.dnf_config,
+                        entries_dir,
+                        entries_dir,
+                        pod,
+                        entries_dir,
+                        pod,
+                        self.container
+                )
+                #print(podman_cmd_entry)
+                process = subprocess.call(
+                        shlex.split(podman_cmd_entry),
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                )
+
+            join_all_pods = ' '.join(repoclosure_entry_name_list)
+            time.sleep(3)
+            self.log.info('Performing repoclosure on %s ... ' % repo)
+            pod_watcher = '{} wait {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            watch_man = subprocess.call(
+                    shlex.split(pod_watcher),
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL
+            )
+
+            for pod in repoclosure_entry_name_list:
+                checkcmd = '{} ps -f status=exited -f name={}'.format(
+                        cmd,
+                        pod
+                )
+                podcheck = subprocess.Popen(
+                        checkcmd,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        shell=True
+                )
+
+                output, errors = podcheck.communicate()
+                if 'Exited (0)' not in output.decode():
+                    self.log.error(Color.FAIL + pod)
+                    bad_exit_list.append(pod)
+
+            rmcmd = '{} rm {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            rmpod = subprocess.Popen(
+                    rmcmd,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL,
+                    shell=True
+            )
+
+            repoclosure_entry_name_list.clear()
+            self.log.info('Syncing %s completed' % repo)
+
+        if len(bad_exit_list) > 0:
+            self.log.error(
+                    Color.BOLD + Color.RED + 'There were issues closing these '
+                    'repositories:' + Color.END
+            )
+            for issue in bad_exit_list:
+                self.log.error(issue)
+
+    def deploy_extra_files(self, sync_root, global_work_root):
+        """
+        deploys extra files based on info of rlvars including a
+        extra_files.json
+
+        might also deploy COMPOSE_ID and maybe in the future a metadata dir with
+        a bunch of compose-esque stuff.
+        """
+        self.log.info(Color.INFO + 'Deploying treeinfo, discinfo, and media.repo')
+
+        cmd = Shared.git_cmd(self.log)
+        tmpclone = '/tmp/clone'
+        extra_files_dir = os.path.join(
+                global_work_root,
+                'extra-files'
+        )
+        metadata_dir = os.path.join(
+                sync_root,
+                "metadata"
+        )
+        if not os.path.exists(extra_files_dir):
+            os.makedirs(extra_files_dir, exist_ok=True)
+
+        if not os.path.exists(metadata_dir):
+            os.makedirs(metadata_dir, exist_ok=True)
+
+        clonecmd = '{} clone {} -b {} -q {}'.format(
+                cmd,
+                self.extra_files['git_repo'],
+                self.extra_files['branch'],
+                tmpclone
+        )
+
+        git_clone = subprocess.call(
+                shlex.split(clonecmd),
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL
+        )
+
+        self.log.info(Color.INFO + 'Deploying extra files to work and metadata directories ...')
+
+        # Copy files to work root
+        for extra in self.extra_files['list']:
+            src = '/tmp/clone/' + extra
+            # Copy extra files to root of compose here also - The extra files
+            # are meant to be picked up by our ISO creation process and also
+            # exist on our mirrors.
+            try:
+                shutil.copy2(src, extra_files_dir)
+                shutil.copy2(src, metadata_dir)
+            except:
+                self.log.warn(Color.WARN + 'Extra file not copied: ' + src)
+
+        try:
+            shutil.rmtree(tmpclone)
+        except OSError as e:
+            self.log.error(Color.FAIL + 'Directory ' + tmpclone +
+                    ' could not be removed: ' + e.strerror
+            )
+
+    def deploy_metadata(self, sync_root):
+        """
+        Deploys metadata that defines information about the compose. Some data
+        will be close to how pungi produces it, but it won't be exact nor a
+        perfect replica.
+        """
+        self.log.info(Color.INFO + 'Deploying metadata for this compose')
+        # Create metadata here
+        # Create COMPOSE_ID here (this doesn't necessarily match anything, it's
+        # just an indicator)
+        metadata_dir = os.path.join(
+                sync_root,
+                "metadata"
+        )
+
+        # It should already exist from a full run or refresh. This is just in
+        # case and it doesn't hurt.
+        if not os.path.exists(metadata_dir):
+            os.makedirs(metadata_dir, exist_ok=True)
+
+        with open(metadata_dir + '/COMPOSE_ID', "w+") as f:
+            f.write(self.compose_id)
+            f.close()
+
+        Shared.write_metadata(
+                self.timestamp,
+                self.date_stamp,
+                self.distname,
+                self.fullversion,
+                self.compose_id,
+                metadata_dir + '/metadata'
+        )
+
+        # TODO: Add in each repo and their corresponding arch.
+        productmd_date = self.date_stamp.split('.')[0]
+        Shared.composeinfo_write(
+                metadata_dir + '/composeinfo',
+                self.distname,
+                self.shortname,
+                self.fullversion,
+                'updates',
+                productmd_date
+        )
+
+        self.log.info(Color.INFO + 'Metadata files phase completed.')
+
+        # Deploy README to metadata directory
+        readme_template = self.tmplenv.get_template('README.tmpl')
+        readme_output = readme_template.render(
+                fullname=self.fullname,
+                version=empanadas.__version__
+        )
+
+        with open(metadata_dir + '/README', 'w+', encoding='utf-8') as readme_file:
+            readme_file.write(readme_output)
+            readme_file.close()
+
+
+    def deploy_treeinfo(self, repo, sync_root, arch):
+        """
+        Deploys initial treeinfo files. These have the potential of being
+        overwritten by our ISO process, which is fine. If there is a treeinfo
+        found, it will be skipped.
+        """
+        self.log.info(Color.INFO + 'Deploying treeinfo, discinfo, and media.repo')
+
+        arches_to_tree = self.arches
+        if arch:
+            arches_to_tree = [arch]
+
+        repos_to_tree = self.repos
+        if repo and not self.fullrun:
+            repos_to_tree = [repo]
+
+        # If a treeinfo or discinfo file exists, it should be skipped.
+        for r in repos_to_tree:
+            entry_name_list = []
+            repo_name = r
+            arch_tree = arches_to_tree.copy()
+
+            if r in self.repo_renames:
+                repo_name = self.repo_renames[r]
+
+            # I feel it's necessary to make sure even i686 has .treeinfo and
+            # .discinfo, just for consistency.
+            if 'all' in r and 'x86_64' in arches_to_tree and self.multilib:
+                arch_tree.append('i686')
+
+            for a in arch_tree:
+                if a == 'source':
+                    continue
+
+                os_tree_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'os/.treeinfo'
+                )
+
+                os_disc_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'os/.discinfo'
+                )
+
+                os_media_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'os/media.repo'
+                )
+
+                ks_tree_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'kickstart/.treeinfo'
+                )
+
+                ks_disc_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'kickstart/.discinfo'
+                )
+
+                ks_media_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        a,
+                        'kickstart/media.repo'
+                )
+
+
+                if not os.path.exists(os_tree_path):
+                    try:
+                        Shared.treeinfo_new_write(
+                                os_tree_path,
+                                self.distname,
+                                self.shortname,
+                                self.fullversion,
+                                a,
+                                int(self.timestamp),
+                                repo_name
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' ' +
+                                a + ' os .treeinfo could not be written'
+                        )
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' ' + a + ' os .treeinfo already exists')
+
+                if not os.path.exists(os_disc_path):
+                    try:
+                        Shared.discinfo_write(
+                                self.timestamp,
+                                self.fullname,
+                                a,
+                                os_disc_path
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' ' +
+                                a + ' os .discinfo could not be written'
+                        )
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' ' + a +
+                            ' os .discinfo already exists'
+                    )
+
+                if not os.path.exists(os_media_path):
+                    try:
+                        Shared.media_repo_write(
+                                self.timestamp,
+                                self.fullname,
+                                os_media_path
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                ' os media.repo could not be written'
+                        )
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' ' + a +
+                            ' os media.repo already exists'
+                    )
+
+                # Kickstart part of the repos
+                if not os.path.exists(ks_tree_path):
+                    try:
+                        Shared.treeinfo_new_write(
+                                ks_tree_path,
+                                self.distname,
+                                self.shortname,
+                                self.fullversion,
+                                a,
+                                int(self.timestamp),
+                                repo_name
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                ' kickstart .treeinfo could not be written'
+                        )
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' ' + a +
+                            ' kickstart .treeinfo already exists'
+                    )
+
+                if not os.path.exists(ks_disc_path):
+                    try:
+                        Shared.discinfo_write(
+                                self.timestamp,
+                                self.fullname,
+                                a,
+                                ks_disc_path
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                ' kickstart .discinfo could not be written'
+                        )
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.FAIL + repo_name + ' ' + a +
+                            ' kickstart .discinfo already exists'
+                    )
+
+                if not os.path.exists(ks_media_path):
+                    try:
+                        Shared.media_repo_write(
+                                self.timestamp,
+                                self.fullname,
+                                ks_media_path
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                ' kickstart media.repo could not be written'
+                        )
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' ' + a +
+                            ' kickstart media.repo already exists'
+                    )
+
+                if not self.ignore_debug and not a == 'source':
+                    debug_tree_path = os.path.join(
+                            sync_root,
+                            repo_name,
+                            a,
+                            'debug/tree/.treeinfo'
+                    )
+
+                    debug_disc_path = os.path.join(
+                            sync_root,
+                            repo_name,
+                            a,
+                            'debug/tree/.discinfo'
+                    )
+
+                    debug_media_path = os.path.join(
+                            sync_root,
+                            repo_name,
+                            a,
+                            'debug/tree/media.repo'
+                    )
+
+                    if not os.path.exists(debug_tree_path):
+                        try:
+                            Shared.treeinfo_new_write(
+                                    debug_tree_path,
+                                    self.distname,
+                                    self.shortname,
+                                    self.fullversion,
+                                    a,
+                                    self.timestamp,
+                                    repo_name
+                            )
+                        except Exception as e:
+                            self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                    ' debug .treeinfo could not be written'
+                            )
+                            self.log.error(e)
+                    else:
+                        self.log.warn(Color.WARN + r + ' ' + a +
+                                ' debug .treeinfo already exists'
+                        )
+
+                    if not os.path.exists(debug_disc_path):
+                        try:
+                            Shared.discinfo_write(
+                                    self.timestamp,
+                                    self.fullname,
+                                    a,
+                                    debug_disc_path
+                            )
+                        except Exception as e:
+                            self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                    ' debug .discinfo could not be written'
+                            )
+                            self.log.error(e)
+                    else:
+                        self.log.warn(Color.WARN + r + ' ' + a +
+                                ' debug .discinfo already exists'
+                        )
+
+                    if not os.path.exists(debug_media_path):
+                        try:
+                            Shared.media_repo_write(
+                                    self.timestamp,
+                                    self.fullname,
+                                    debug_media_path
+                            )
+                        except Exception as e:
+                            self.log.error(Color.FAIL + repo_name + ' ' + a +
+                                    ' debug media.repo could not be written'
+                            )
+                            self.log.error(e)
+                    else:
+                        self.log.warn(Color.WARN + repo_name + ' ' + a +
+                                ' debug media.repo already exists'
+                        )
+
+
+            if not self.ignore_source and not arch:
+                source_tree_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        'source/tree/.treeinfo'
+                )
+
+                source_disc_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        'source/tree/.discinfo'
+                )
+
+                source_media_path = os.path.join(
+                        sync_root,
+                        repo_name,
+                        'source/tree/media.repo'
+                )
+
+                if not os.path.exists(source_tree_path):
+                    try:
+                        Shared.treeinfo_new_write(
+                                source_tree_path,
+                                self.distname,
+                                self.shortname,
+                                self.fullversion,
+                                'src',
+                                self.timestamp,
+                                repo_name
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' source os .treeinfo could not be written')
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' source os .treeinfo already exists')
+
+                if not os.path.exists(source_disc_path):
+                    try:
+                        Shared.discinfo_write(
+                                self.timestamp,
+                                self.fullname,
+                                'src',
+                                source_disc_path
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' source os .discinfo could not be written')
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' source .discinfo already exists')
+
+                if not os.path.exists(source_media_path):
+                    try:
+                        Shared.media_repo_write(
+                                self.timestamp,
+                                self.fullname,
+                                source_media_path
+                        )
+                    except Exception as e:
+                        self.log.error(Color.FAIL + repo_name + ' source os media.repo could not be written')
+                        self.log.error(e)
+                else:
+                    self.log.warn(Color.WARN + repo_name + ' source media.repo already exists')
+
+    def tweak_treeinfo(self, repo, sync_root, arch):
+        """
+        This modifies treeinfo for the primary repository. If the repository is
+        listed in the iso_map as a non-disc, it will be considered for modification.
+        """
+        variants_to_tweak = []
+
+        arches_to_tree = self.arches
+        if arch:
+            arches_to_tree = [arch]
+
+        repos_to_tree = self.repos
+        if repo and not self.fullrun:
+            repos_to_tree = [repo]
+
+        for r in repos_to_tree:
+            entry_name_list = []
+            repo_name = r
+            arch_tree = arches_to_tree.copy()
+
+            if r in self.iso_map['images']:
+                variants_to_tweak.append(r)
+
+        if not len(variants_to_tweak) > 0:
+            self.log.info(Color.INFO + 'No treeinfo to tweak.')
+            return
+
+        for a in arches_to_tree:
+            for v in variants_to_tweak:
+                self.log.info(Color.INFO + 'Tweaking treeinfo for ' + a + ' ' + v)
+                image = os.path.join(sync_root, v, a, 'os')
+                imagemap = self.iso_map['images'][v]
+                data = {
+                        'arch': a,
+                        'variant': v,
+                        'variant_path': image,
+                        'checksum': self.checksum,
+                        'distname': self.distname,
+                        'fullname': self.fullname,
+                        'shortname': self.shortname,
+                        'release': self.fullversion,
+                        'timestamp': self.timestamp,
+                }
+
+                try:
+                    Shared.treeinfo_modify_write(data, imagemap, self.log)
+                except Exception as e:
+                    self.log.error(Color.FAIL + 'There was an error writing os treeinfo.')
+                    self.log.error(e)
+
+                if self.fullrun:
+                    ksimage = os.path.join(sync_root, v, a, 'kickstart')
+                    ksdata = {
+                            'arch': a,
+                            'variant': v,
+                            'variant_path': ksimage,
+                            'checksum': self.checksum,
+                            'distname': self.distname,
+                            'fullname': self.fullname,
+                            'shortname': self.shortname,
+                            'release': self.fullversion,
+                            'timestamp': self.timestamp,
+                    }
+
+                    try:
+                        Shared.treeinfo_modify_write(ksdata, imagemap, self.log)
+                    except Exception as e:
+                        self.log.error(Color.FAIL + 'There was an error writing kickstart treeinfo.')
+                        self.log.error(e)
+
+    def run_compose_closeout(self):
+        """
+        Closes out a compose. This ensures the ISO's are synced from work/isos
+        to compose/isos, checks for live media and syncs as well from work/live
+        to compose/live, deploys final metadata.
+        """
+        # latest-X-Y should exist at all times for this to work.
+        work_root = os.path.join(
+                self.compose_latest_dir,
+                'work'
+        )
+        sync_root = self.compose_latest_sync
+
+        sync_iso_root = os.path.join(
+                sync_root,
+                'isos'
+        )
+
+        tmp_dir = os.path.join(
+                self.compose_root,
+                'partitions'
+        )
+
+        # Verify if the link even exists
+        if not os.path.exists(self.compose_latest_dir):
+            self.log.error(
+                    '!! Latest compose link is broken does not exist: %s' % self.compose_latest_dir
+            )
+            self.log.error(
+                    '!! Please perform a full run if you have not done so.'
+            )
+            raise SystemExit()
+
+        log_root = os.path.join(
+                work_root,
+                "logs",
+                self.date_stamp
+        )
+
+        iso_root = os.path.join(
+                work_root,
+                "isos"
+        )
+
+        live_root = os.path.join(
+                work_root,
+                "live"
+        )
+
+        sync_live_root = os.path.join(
+                sync_root,
+                'live'
+        )
+
+        images_root = os.path.join(
+                work_root,
+                'images'
+        )
+
+        sync_images_root = os.path.join(
+                sync_root,
+                'images'
+        )
+
+        global_work_root = os.path.join(
+                work_root,
+                "global",
+        )
+
+        # Standard ISOs
+        self.log.info(Color.INFO + 'Starting to sync ISOs to compose')
+
+        if os.path.exists('/usr/bin/fpsync'):
+            self.log.info(Color.INFO + 'Starting up fpsync')
+            message, ret = Shared.fpsync_method(iso_root, sync_iso_root, tmp_dir)
+        elif os.path.exists('/usr/bin/parallel') and os.path.exists('/usr/bin/rsync'):
+            self.log.info(Color.INFO + 'Starting up parallel | rsync')
+            message, ret = Shared.rsync_method(iso_root, sync_iso_root)
+        else:
+            self.log.error(
+                    Color.FAIL +
+                    'fpsync nor parallel + rsync were found on this system. ' +
+                    'There is also no built-in parallel rsync method at this ' +
+                    'time.'
+            )
+            raise SystemExit()
+
+        if ret != 0:
+            self.log.error(Color.FAIL + message)
+        else:
+            self.log.info(Color.INFO + message)
+
+        # Live images
+        if os.path.exists(live_root):
+            self.log.info(Color.INFO + 'Starting to sync live images to compose')
+
+            if os.path.exists('/usr/bin/fpsync'):
+                message, ret = Shared.fpsync_method(live_root, sync_live_root, tmp_dir)
+            elif os.path.exists('/usr/bin/parallel') and os.path.exists('/usr/bin/rsync'):
+                message, ret = Shared.rsync_method(live_root, sync_live_root)
+
+            if ret != 0:
+                self.log.error(Color.FAIL + message)
+            else:
+                self.log.info(Color.INFO + message)
+
+        # Cloud images
+        if os.path.exists(images_root):
+            self.log.info(Color.INFO + 'Starting to sync cloud images to compose')
+
+            if os.path.exists('/usr/bin/fpsync'):
+                message, ret = Shared.fpsync_method(images_root, sync_images_root, tmp_dir)
+            elif os.path.exists('/usr/bin/parallel') and os.path.exists('/usr/bin/rsync'):
+                message, ret = Shared.rsync_method(images_root, sync_images_root)
+
+            if ret != 0:
+                self.log.error(Color.FAIL + message)
+            else:
+                self.log.info(Color.INFO + message)
+
+        # Combine all checksums here
+        for arch in self.arches:
+            iso_arch_root = os.path.join(sync_iso_root, arch)
+            iso_arch_checksum = os.path.join(iso_arch_root, 'CHECKSUM')
+            if os.path.exists(iso_arch_root):
+                with open(iso_arch_checksum, 'w+', encoding='utf-8') as fp:
+                    for check in glob.iglob(iso_arch_root + '/*.CHECKSUM'):
+                        with open(check, 'r', encoding='utf-8') as sum:
+                            for line in sum:
+                                fp.write(line)
+                            sum.close()
+                    fp.close()
+
+            live_arch_root = os.path.join(sync_live_root, arch)
+            live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM')
+            if os.path.exists(live_arch_root):
+                with open(live_arch_checksum, 'w+', encoding='utf-8') as lp:
+                    for lcheck in glob.iglob(live_arch_root + '/*.CHECKSUM'):
+                        with open(lcheck, 'r', encoding='utf-8') as sum:
+                            for line in sum:
+                                lp.write(line)
+                            sum.close()
+                    lp.close()
+
+            images_arch_root = os.path.join(sync_images_root, arch)
+            images_arch_checksum = os.path.join(sync_images_root, 'CHECKSUM')
+            if os.path.exists(images_arch_root):
+                with open(images_arch_checksum, 'w+', encoding='utf-8') as ip:
+                    for icheck in glob.iglob(images_arch_root + '/*.CHECKSUM'):
+                        with open(icheck, 'r', encoding='utf-8') as sum:
+                            for line in sum:
+                                ip.write(line)
+                            sum.close()
+                    ip.close()
+
+        # Deploy final metadata for a close out
+        self.deploy_metadata(sync_root)
+
+class SigRepoSync:
+    """
+    This helps us do reposync operations for SIG's. Do not use this for the
+    base system. Use RepoSync for that.
+    """
+    def __init__(
+            self,
+            rlvars,
+            config,
+            sigvars,
+            major,
+            repo=None,
+            arch=None,
+            ignore_debug: bool = False,
+            ignore_source: bool = False,
+            repoclosure: bool = False,
+            refresh_extra_files: bool = False,
+            skip_all: bool = False,
+            hashed: bool = False,
+            parallel: bool = False,
+            dryrun: bool = False,
+            fullrun: bool = False,
+            nofail: bool = False,
+            logger=None
+        ):
+        self.nofail = nofail
+        self.dryrun = dryrun
+        self.fullrun = fullrun
+        self.arch = arch
+        self.ignore_debug = ignore_debug
+        self.ignore_source = ignore_source
+        self.skip_all = skip_all
+        self.hashed = hashed
+        self.repoclosure = repoclosure
+        self.refresh_extra_files = refresh_extra_files
+        # Enables podman syncing, which should effectively speed up operations
+        self.parallel = parallel
+        # Relevant config items
+        self.major_version = major
+        self.date_stamp = config['date_stamp']
+        self.timestamp = time.time()
+        self.repo_base_url = config['repo_base_url']
+        self.compose_root = config['compose_root']
+        self.compose_base = config['compose_root'] + "/" + major
+        self.profile = rlvars['profile']
+        self.sigprofile = sigvars['profile']
+        self.iso_map = rlvars['iso_map']
+        self.distname = config['distname']
+        self.fullname = rlvars['fullname']
+        self.shortname = config['shortname']
+
+        # Relevant major version items
+        self.sigvars = sigvars
+        self.sigrepos = sigvars.keys()
+        #self.arches = sigvars['allowed_arches']
+        #self.project_id = sigvars['project_id']
+        self.sigrepo = repo
+
+        # Templates
+        file_loader = FileSystemLoader(f"{_rootdir}/templates")
+        self.tmplenv = Environment(loader=file_loader)
+
+        # each el can have its own designated container to run stuff in,
+        # otherwise we'll just default to the default config.
+        self.container = config['container']
+        if 'container' in rlvars and len(rlvars['container']) > 0:
+            self.container = rlvars['container']
+
+        if 'repoclosure_map' in rlvars and len(rlvars['repoclosure_map']) > 0:
+            self.repoclosure_map = rlvars['repoclosure_map']
+
+        self.staging_dir = os.path.join(
+                    config['staging_root'],
+                    config['sig_category_stub'],
+                    major
+        )
+
+        self.compose_latest_dir = os.path.join(
+                config['compose_root'],
+                major,
+                "latest-{}-{}-SIG-{}".format(
+                    self.shortname,
+                    major,
+                    self.sigprofile
+                )
+        )
+
+        self.compose_latest_sync = os.path.join(
+                self.compose_latest_dir,
+                "compose"
+        )
+
+        self.compose_log_dir = os.path.join(
+                self.compose_latest_dir,
+                "work/logs"
+        )
+
+        self.compose_global_work_root = os.path.join(
+                self.compose_latest_dir,
+                "work/global"
+        )
+
+        # This is temporary for now.
+        if logger is None:
+            self.log = logging.getLogger("sigreposync")
+            self.log.setLevel(logging.INFO)
+            handler = logging.StreamHandler(sys.stdout)
+            handler.setLevel(logging.INFO)
+            formatter = logging.Formatter(
+                    '%(asctime)s :: %(name)s :: %(message)s',
+                    '%Y-%m-%d %H:%M:%S'
+            )
+            handler.setFormatter(formatter)
+            self.log.addHandler(handler)
+
+        self.log.info('sig reposync init')
+        self.log.info(major)
+        #self.dnf_config = Shared.generate_conf()
+
+    def run(self):
+        """
+        This runs the sig sync.
+        """
+        pass
diff --git a/iso/empanadas/empanadas/util/dnf_utils.py b/iso/empanadas/empanadas/util/dnf_utils.py
index 820f6db..a706c38 100644
--- a/iso/empanadas/empanadas/util/dnf_utils.py
+++ b/iso/empanadas/empanadas/util/dnf_utils.py
@@ -57,7 +57,12 @@ class RepoSync:
             fullrun: bool = False,
             nofail: bool = False,
             gpgkey: str = 'stable',
+            gpg_check: bool = True,
+            repo_gpg_check: bool = True,
             rlmode: str = 'stable',
+            just_pull_everything: bool = False,
+            extra_dnf_args=None,
+            reposync_clean_old: bool = False,
             logger=None
         ):
         self.nofail = nofail
@@ -73,6 +78,9 @@ class RepoSync:
         self.refresh_treeinfo = refresh_treeinfo
         # Enables podman syncing, which should effectively speed up operations
         self.parallel = parallel
+        # This makes it so every repo is synced at the same time.
+        # This is EXTREMELY dangerous.
+        self.just_pull_everything = just_pull_everything
         # Relevant config items
         self.major_version = major
         self.date_stamp = config['date_stamp']
@@ -88,7 +96,8 @@ class RepoSync:
 
         # Relevant major version items
         self.shortname = config['shortname']
-        self.revision = rlvars['revision'] + "-" + rlvars['rclvl']
+        self.revision_level = rlvars['revision'] + "-" + rlvars['rclvl']
+        self.revision = rlvars['revision']
         self.fullversion = rlvars['revision']
         self.arches = rlvars['allowed_arches']
         self.project_id = rlvars['project_id']
@@ -99,6 +108,8 @@ class RepoSync:
         self.extra_files = rlvars['extra_files']
         self.gpgkey = gpgkey
         self.checksum = rlvars['checksum']
+        self.gpg_check = gpg_check
+        self.repo_gpg_check = repo_gpg_check
 
         self.compose_id = '{}-{}-{}'.format(
                 config['shortname'],
@@ -110,6 +121,17 @@ class RepoSync:
         file_loader = FileSystemLoader(f"{_rootdir}/templates")
         self.tmplenv = Environment(loader=file_loader)
 
+        # dnf args
+        dnf_args_to_add = []
+        if extra_dnf_args:
+            if '--delete' in extra_dnf_args:
+                raise SystemExit('Please use the --reposync-clean option instead.')
+
+            dnf_args_to_add.extend(extra_dnf_args.split(' '))
+
+        self.extra_dnf_args = dnf_args_to_add.copy()
+        self.reposync_clean_old = reposync_clean_old
+
         # each el can have its own designated container to run stuff in,
         # otherwise we'll just default to the default config.
         self.container = config['container']
@@ -119,12 +141,6 @@ class RepoSync:
         if 'repoclosure_map' in rlvars and len(rlvars['repoclosure_map']) > 0:
             self.repoclosure_map = rlvars['repoclosure_map']
 
-        self.staging_dir = os.path.join(
-                    config['staging_root'],
-                    config['category_stub'],
-                    self.revision
-        )
-
         self.compose_latest_dir = os.path.join(
                 config['compose_root'],
                 major,
@@ -163,7 +179,7 @@ class RepoSync:
             self.log.addHandler(handler)
 
         self.log.info('reposync init')
-        self.log.info(self.revision)
+        self.log.info(self.revision_level)
 
         # The repo name should be valid
         if self.repo is not None:
@@ -234,8 +250,20 @@ class RepoSync:
                 "global",
         )
 
-        #self.dnf_config = self.generate_conf(dest_path=global_work_root)
-        self.dnf_config = self.generate_conf()
+        self.dnf_config = Shared.generate_conf(
+                self.shortname,
+                self.major_version,
+                self.repos,
+                self.repo_base_url,
+                self.project_id,
+                self.hashed,
+                self.extra_files,
+                self.gpgkey,
+                self.gpg_check,
+                self.repo_gpg_check,
+                self.tmplenv,
+                self.log
+        )
 
         if self.dryrun:
             self.log.error('Dry Runs are not supported just yet. Sorry!')
@@ -244,10 +272,11 @@ class RepoSync:
         if self.fullrun and self.refresh_extra_files:
             self.log.warn(Color.WARN + 'A full run implies extra files are also deployed.')
 
-        self.sync(self.repo, sync_root, work_root, log_root, global_work_root, self.arch)
+        if not self.skip_all:
+            self.sync(self.repo, sync_root, work_root, log_root, global_work_root, self.arch)
 
         if self.fullrun:
-            self.deploy_extra_files(sync_root, global_work_root)
+            Shared.deploy_extra_files(self.extra_files, sync_root, global_work_root, self.log)
             self.deploy_treeinfo(self.repo, sync_root, self.arch)
             self.tweak_treeinfo(self.repo, sync_root, self.arch)
             self.symlink_to_latest(generated_dir)
@@ -256,7 +285,7 @@ class RepoSync:
             self.repoclosure_work(sync_root, work_root, log_root)
 
         if self.refresh_extra_files and not self.fullrun:
-            self.deploy_extra_files(sync_root, global_work_root)
+            Shared.deploy_extra_files(self.extra_files, sync_root, global_work_root, self.log)
 
         # deploy_treeinfo does NOT overwrite any treeinfo files. However,
         # tweak_treeinfo calls out to a method that does. This should not
@@ -284,15 +313,7 @@ class RepoSync:
         if self.parallel:
             self.podman_sync(repo, sync_root, work_root, log_root, global_work_root, arch)
         else:
-            self.dnf_sync(repo, sync_root, work_root, arch)
-
-    def dnf_sync(self, repo, sync_root, work_root, arch):
-        """
-        This is for normal dnf syncs. This is very slow.
-        """
-        self.log.error('DNF syncing has been removed.')
-        self.log.error('Please install podman and enable parallel')
-        raise SystemExit()
+            Shared.dnf_sync(repo, sync_root, work_root, arch, self.log)
 
     def podman_sync(
             self,
@@ -314,8 +335,11 @@ class RepoSync:
         cmd = Shared.podman_cmd(self.log)
         contrunlist = []
         bad_exit_list = []
+        extra_dnf_args = ' '.join(self.extra_dnf_args.copy())
+        reposync_delete = '--delete' if self.reposync_clean_old else ''
         self.log.info('Generating container entries')
         entries_dir = os.path.join(work_root, "entries")
+        gpg_key_url = self.extra_files['git_raw_path'] + self.extra_files['gpg'][self.gpgkey]
         if not os.path.exists(entries_dir):
             os.makedirs(entries_dir, exist_ok=True)
 
@@ -346,13 +370,10 @@ class RepoSync:
             if r in self.repo_renames:
                 repo_name = self.repo_renames[r]
 
-
+            # Sync all if arch is x86_64 and multilib is true
             if 'all' in r and 'x86_64' in arches_to_sync and self.multilib:
                 arch_sync.append('i686')
 
-            # There should be a check here that if it's "all" and multilib
-            # is on, i686 should get synced too.
-
             for a in arch_sync:
                 entry_name = '{}-{}'.format(r, a)
                 debug_entry_name = '{}-debug-{}'.format(r, a)
@@ -386,10 +407,7 @@ class RepoSync:
                         'debug/tree'
                 )
 
-                import_gpg_cmd = ("/usr/bin/rpm --import {}{}").format(
-                        self.extra_files['git_raw_path'],
-                        self.extra_files['gpg'][self.gpgkey]
-                )
+                import_gpg_cmd = ("/usr/bin/rpm --import {}").format(gpg_key_url)
 
                 arch_force_cp = ("/usr/bin/sed 's|$basearch|{}|g' {} > {}.{}".format(
                     a,
@@ -410,24 +428,43 @@ class RepoSync:
                         a
                 )
 
+                metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={} "
+                        "--forcearch {} --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        a
+                )
+
                 sync_cmd = ("/usr/bin/dnf reposync -c {}.{} --download-metadata "
-                        "--repoid={} -p {} --forcearch {} --norepopath "
-                        "--gpgcheck --assumeyes 2>&1").format(
+                        "--repoid={} -p {} --forcearch {} --norepopath --remote-time "
+                        "--gpgcheck --assumeyes {} 2>&1").format(
                         self.dnf_config,
                         a,
                         r,
                         os_sync_path,
+                        a,
+                        reposync_delete
+                )
+
+                debug_metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={}-debug "
+                        "--forcearch {} --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
                         a
                 )
 
+
                 debug_sync_cmd = ("/usr/bin/dnf reposync -c {}.{} "
                         "--download-metadata --repoid={}-debug -p {} --forcearch {} "
-                        "--gpgcheck --norepopath --assumeyes 2>&1").format(
+                        "--gpgcheck --norepopath --remote-time --assumeyes {} 2>&1").format(
                         self.dnf_config,
                         a,
                         r,
                         debug_sync_path,
-                        a
+                        a,
+                        reposync_delete
                 )
 
                 dnf_plugin_cmd = "/usr/bin/dnf install dnf-plugins-core -y"
@@ -438,6 +475,7 @@ class RepoSync:
                         arch_force_cp=arch_force_cp,
                         dnf_plugin_cmd=dnf_plugin_cmd,
                         sync_cmd=sync_cmd,
+                        metadata_cmd=metadata_cmd,
                         sync_log=sync_log,
                         download_path=os_sync_path
                 )
@@ -448,6 +486,7 @@ class RepoSync:
                         arch_force_cp=arch_force_cp,
                         dnf_plugin_cmd=dnf_plugin_cmd,
                         sync_cmd=debug_sync_cmd,
+                        metadata_cmd=debug_metadata_cmd,
                         sync_log=debug_sync_log,
                         download_path=debug_sync_path
                 )
@@ -482,9 +521,17 @@ class RepoSync:
                             'kickstart'
                     )
 
+                    ks_metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={} "
+                            "--forcearch {} --assumeyes 2>&1").format(
+                            self.dnf_config,
+                            a,
+                            r,
+                            a
+                    )
+
                     ks_sync_cmd = ("/usr/bin/dnf reposync -c {}.{} --download-metadata "
                             "--repoid={} -p {} --forcearch {} --norepopath "
-                            "--gpgcheck --assumeyes 2>&1").format(
+                            "--gpgcheck --assumeyes --remote-time 2>&1").format(
                             self.dnf_config,
                             a,
                             r,
@@ -504,6 +551,7 @@ class RepoSync:
                             arch_force_cp=arch_force_cp,
                             dnf_plugin_cmd=dnf_plugin_cmd,
                             sync_cmd=ks_sync_cmd,
+                            metadata_cmd=ks_metadata_cmd,
                             sync_log=ks_sync_log
                     )
                     ks_entry_point_open = open(ks_point_sh, "w+")
@@ -533,12 +581,19 @@ class RepoSync:
                         repo_name
                 )
 
+                source_metadata_cmd = ("/usr/bin/dnf makecache -c {} --repoid={}-source "
+                        "--assumeyes 2>&1").format(
+                        self.dnf_config,
+                        r
+                )
+
                 source_sync_cmd = ("/usr/bin/dnf reposync -c {} "
                         "--download-metadata --repoid={}-source -p {} "
-                        "--gpgcheck --norepopath --assumeyes 2>&1").format(
+                        "--gpgcheck --norepopath --remote-time --assumeyes {} 2>&1").format(
                         self.dnf_config,
                         r,
-                        source_sync_path
+                        source_sync_path,
+                        reposync_delete
                 )
 
                 source_sync_template = self.tmplenv.get_template('reposync-src.tmpl')
@@ -546,6 +601,7 @@ class RepoSync:
                         import_gpg_cmd=import_gpg_cmd,
                         dnf_plugin_cmd=dnf_plugin_cmd,
                         sync_cmd=source_sync_cmd,
+                        metadata_cmd=source_metadata_cmd,
                         sync_log=source_sync_log
                 )
 
@@ -555,7 +611,7 @@ class RepoSync:
                 os.chmod(source_entry_point_sh, 0o755)
 
             # Spawn up all podman processes for repo
-            self.log.info('Starting podman processes for %s ...' % r)
+            self.log.info(Color.INFO + 'Starting podman processes for %s ...' % r)
 
             #print(entry_name_list)
             for pod in entry_name_list:
@@ -582,6 +638,7 @@ class RepoSync:
             join_all_pods = ' '.join(entry_name_list)
             time.sleep(3)
             self.log.info(Color.INFO + 'Syncing ' + r + ' ...')
+            self.log.info(Color.INFO + 'Arches: ' + ' '.join(arch_sync))
             pod_watcher = '{} wait {}'.format(
                     cmd,
                     join_all_pods
@@ -658,70 +715,6 @@ class RepoSync:
         self.log.info('Symlinking to latest-{}-{}...'.format(self.shortname, self.major_version))
         os.symlink(generated_dir, self.compose_latest_dir)
 
-    def generate_conf(self, dest_path='/var/tmp') -> str:
-        """
-        Generates the necessary repo conf file for the operation. This repo
-        file should be temporary in nature. This will generate a repo file
-        with all repos by default. If a repo is chosen for sync, that will be
-        the only one synced.
-
-        :param dest_path: The destination where the temporary conf goes
-        :param repo: The repo object to create a file for
-        """
-        fname = os.path.join(
-                dest_path,
-                "{}-{}-config.repo".format(self.shortname, self.major_version)
-        )
-        pname = os.path.join(
-                '/var/tmp',
-                "{}-{}-config.repo".format(self.shortname, self.major_version)
-        )
-        self.log.info('Generating the repo configuration: %s' % fname)
-
-        if self.repo_base_url.startswith("/"):
-            self.log.error("Local file syncs are not supported.")
-            raise SystemExit(Color.BOLD + "Local file syncs are not "
-                "supported." + Color.END)
-
-        prehashed = ''
-        if self.hashed:
-            prehashed = "hashed-"
-        # create dest_path
-        if not os.path.exists(dest_path):
-            os.makedirs(dest_path, exist_ok=True)
-        config_file = open(fname, "w+")
-        repolist = []
-        for repo in self.repos:
-            constructed_url = '{}/{}/repo/{}{}/$basearch'.format(
-                    self.repo_base_url,
-                    self.project_id,
-                    prehashed,
-                    repo,
-            )
-
-            constructed_url_src = '{}/{}/repo/{}{}/src'.format(
-                    self.repo_base_url,
-                    self.project_id,
-                    prehashed,
-                    repo,
-            )
-
-            repodata = {
-                    'name': repo,
-                    'baseurl': constructed_url,
-                    'srcbaseurl': constructed_url_src,
-                    'gpgkey': self.extra_files['git_raw_path'] + self.extra_files['gpg'][self.gpgkey]
-            }
-            repolist.append(repodata)
-
-        template = self.tmplenv.get_template('repoconfig.tmpl')
-        output = template.render(repos=repolist)
-        config_file.write(output)
-
-        config_file.close()
-        #return (fname, pname)
-        return fname
-
     def repoclosure_work(self, sync_root, work_root, log_root):
         """
         This is where we run repoclosures, based on the configuration of each
@@ -878,66 +871,6 @@ class RepoSync:
             for issue in bad_exit_list:
                 self.log.error(issue)
 
-    def deploy_extra_files(self, sync_root, global_work_root):
-        """
-        deploys extra files based on info of rlvars including a
-        extra_files.json
-
-        might also deploy COMPOSE_ID and maybe in the future a metadata dir with
-        a bunch of compose-esque stuff.
-        """
-        self.log.info(Color.INFO + 'Deploying treeinfo, discinfo, and media.repo')
-
-        cmd = Shared.git_cmd(self.log)
-        tmpclone = '/tmp/clone'
-        extra_files_dir = os.path.join(
-                global_work_root,
-                'extra-files'
-        )
-        metadata_dir = os.path.join(
-                sync_root,
-                "metadata"
-        )
-        if not os.path.exists(extra_files_dir):
-            os.makedirs(extra_files_dir, exist_ok=True)
-
-        if not os.path.exists(metadata_dir):
-            os.makedirs(metadata_dir, exist_ok=True)
-
-        clonecmd = '{} clone {} -b {} -q {}'.format(
-                cmd,
-                self.extra_files['git_repo'],
-                self.extra_files['branch'],
-                tmpclone
-        )
-
-        git_clone = subprocess.call(
-                shlex.split(clonecmd),
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL
-        )
-
-        self.log.info(Color.INFO + 'Deploying extra files to work and metadata directories ...')
-
-        # Copy files to work root
-        for extra in self.extra_files['list']:
-            src = '/tmp/clone/' + extra
-            # Copy extra files to root of compose here also - The extra files
-            # are meant to be picked up by our ISO creation process and also
-            # exist on our mirrors.
-            try:
-                shutil.copy2(src, extra_files_dir)
-                shutil.copy2(src, metadata_dir)
-            except:
-                self.log.warn(Color.WARN + 'Extra file not copied: ' + src)
-
-        try:
-            shutil.rmtree(tmpclone)
-        except OSError as e:
-            self.log.error(Color.FAIL + 'Directory ' + tmpclone +
-                    ' could not be removed: ' + e.strerror
-            )
-
     def deploy_metadata(self, sync_root):
         """
         Deploys metadata that defines information about the compose. Some data
@@ -1376,25 +1309,25 @@ class RepoSync:
                     self.log.error(Color.FAIL + 'There was an error writing os treeinfo.')
                     self.log.error(e)
 
-                if self.fullrun:
-                    ksimage = os.path.join(sync_root, v, a, 'kickstart')
-                    ksdata = {
-                            'arch': a,
-                            'variant': v,
-                            'variant_path': ksimage,
-                            'checksum': self.checksum,
-                            'distname': self.distname,
-                            'fullname': self.fullname,
-                            'shortname': self.shortname,
-                            'release': self.fullversion,
-                            'timestamp': self.timestamp,
-                    }
+                #if self.fullrun:
+                ksimage = os.path.join(sync_root, v, a, 'kickstart')
+                ksdata = {
+                        'arch': a,
+                        'variant': v,
+                        'variant_path': ksimage,
+                        'checksum': self.checksum,
+                        'distname': self.distname,
+                        'fullname': self.fullname,
+                        'shortname': self.shortname,
+                        'release': self.fullversion,
+                        'timestamp': self.timestamp,
+                }
 
-                    try:
-                        Shared.treeinfo_modify_write(ksdata, imagemap, self.log)
-                    except Exception as e:
-                        self.log.error(Color.FAIL + 'There was an error writing kickstart treeinfo.')
-                        self.log.error(e)
+                try:
+                    Shared.treeinfo_modify_write(ksdata, imagemap, self.log)
+                except Exception as e:
+                    self.log.error(Color.FAIL + 'There was an error writing kickstart treeinfo.')
+                    self.log.error(e)
 
     def run_compose_closeout(self):
         """
@@ -1541,7 +1474,7 @@ class RepoSync:
                     lp.close()
 
             images_arch_root = os.path.join(sync_images_root, arch)
-            images_arch_checksum = os.path.join(sync_images_root, 'CHECKSUM')
+            images_arch_checksum = os.path.join(images_arch_root, 'CHECKSUM')
             if os.path.exists(images_arch_root):
                 with open(images_arch_checksum, 'w+', encoding='utf-8') as ip:
                     for icheck in glob.iglob(images_arch_root + '/*.CHECKSUM'):
@@ -1554,6 +1487,186 @@ class RepoSync:
         # Deploy final metadata for a close out
         self.deploy_metadata(sync_root)
 
+    def run_upstream_repoclosure(self):
+        """
+        This does a repoclosure check in peridot
+        """
+        work_root = os.path.join(
+                self.compose_latest_dir,
+                'work'
+        )
+        # Verify if the link even exists
+        if not os.path.exists(self.compose_latest_dir):
+            self.log.error(
+                    '!! Latest compose link is broken does not exist: %s' % self.compose_latest_dir
+            )
+            self.log.error(
+                    '!! Please perform a full run if you have not done so.'
+            )
+            raise SystemExit()
+
+        log_root = os.path.join(
+                work_root,
+                "logs",
+                self.date_stamp
+        )
+
+        if not os.path.exists(log_root):
+            os.makedirs(log_root, exist_ok=True)
+
+        cmd = Shared.podman_cmd(self.log)
+        entries_dir = os.path.join(work_root, "entries")
+        bad_exit_list = []
+        dnf_config = Shared.generate_conf(
+                self.shortname,
+                self.major_version,
+                self.repos,
+                self.repo_base_url,
+                self.project_id,
+                self.hashed,
+                self.extra_files,
+                self.gpgkey,
+                self.gpg_check,
+                self.repo_gpg_check,
+                self.tmplenv,
+                self.log
+        )
+
+
+        if not self.parallel:
+            self.log.error('repoclosure is too slow to run one by one. enable parallel mode.')
+            raise SystemExit()
+
+        self.log.info('Beginning upstream repoclosure')
+        for repo in self.repoclosure_map['repos']:
+            if self.repo and repo not in self.repo:
+                continue
+
+            repoclosure_entry_name_list = []
+            self.log.info('Setting up repoclosure for {}'.format(repo))
+
+            for arch in self.repoclosure_map['arches']:
+                repo_combination = []
+                repoclosure_entry_name = 'peridot-repoclosure-{}-{}'.format(repo, arch)
+                repoclosure_entry_name_list.append(repoclosure_entry_name)
+                repoclosure_arch_list = self.repoclosure_map['arches'][arch]
+
+                # Some repos will have additional repos to close against - this
+                # helps append
+                if len(self.repoclosure_map['repos'][repo]) > 0:
+                    for l in self.repoclosure_map['repos'][repo]:
+                        stretch = '--repo={}'.format(l)
+                        repo_combination.append(stretch)
+
+                join_repo_comb = ' '.join(repo_combination)
+
+                repoclosure_entry_point_sh = os.path.join(
+                        entries_dir,
+                        repoclosure_entry_name
+                )
+                repoclosure_entry_point_sh = os.path.join(
+                        entries_dir,
+                        repoclosure_entry_name
+                )
+                repoclosure_cmd = ('/usr/bin/dnf repoclosure {} '
+                        '--repo={} --check={} {} -c {} -y '
+                        '| tee -a {}/peridot-{}-repoclosure-{}.log').format(
+                        repoclosure_arch_list,
+                        repo,
+                        repo,
+                        join_repo_comb,
+                        dnf_config,
+                        log_root,
+                        repo,
+                        arch
+                )
+                repoclosure_entry_point_open = open(repoclosure_entry_point_sh, "w+")
+                repoclosure_entry_point_open.write('#!/bin/bash\n')
+                repoclosure_entry_point_open.write('set -o pipefail\n')
+                repoclosure_entry_point_open.write('/usr/bin/dnf install dnf-plugins-core -y\n')
+                repoclosure_entry_point_open.write('/usr/bin/dnf clean all\n')
+                repoclosure_entry_point_open.write(repoclosure_cmd + '\n')
+                repoclosure_entry_point_open.close()
+                os.chmod(repoclosure_entry_point_sh, 0o755)
+                repo_combination.clear()
+
+            self.log.info('Spawning pods for %s' % repo)
+            for pod in repoclosure_entry_name_list:
+                podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
+                        cmd,
+                        self.compose_root,
+                        self.compose_root,
+                        dnf_config,
+                        dnf_config,
+                        entries_dir,
+                        entries_dir,
+                        pod,
+                        entries_dir,
+                        pod,
+                        self.container
+                )
+                #print(podman_cmd_entry)
+                process = subprocess.call(
+                        shlex.split(podman_cmd_entry),
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                )
+
+            join_all_pods = ' '.join(repoclosure_entry_name_list)
+            time.sleep(3)
+            self.log.info('Performing repoclosure on %s ... ' % repo)
+            pod_watcher = '{} wait {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            watch_man = subprocess.call(
+                    shlex.split(pod_watcher),
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL
+            )
+
+            for pod in repoclosure_entry_name_list:
+                checkcmd = '{} ps -f status=exited -f name={}'.format(
+                        cmd,
+                        pod
+                )
+                podcheck = subprocess.Popen(
+                        checkcmd,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        shell=True
+                )
+
+                output, errors = podcheck.communicate()
+                if 'Exited (0)' not in output.decode():
+                    self.log.error(Color.FAIL + pod)
+                    bad_exit_list.append(pod)
+
+            rmcmd = '{} rm {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            rmpod = subprocess.Popen(
+                    rmcmd,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL,
+                    shell=True
+            )
+
+            repoclosure_entry_name_list.clear()
+            self.log.info('Syncing %s completed' % repo)
+
+        if len(bad_exit_list) > 0:
+            self.log.error(
+                    Color.BOLD + Color.RED + 'There were issues closing these '
+                    'repositories:' + Color.END
+            )
+            for issue in bad_exit_list:
+                self.log.error(issue)
+
+
 class SigRepoSync:
     """
     This helps us do reposync operations for SIG's. Do not use this for the
@@ -1577,6 +1690,11 @@ class SigRepoSync:
             dryrun: bool = False,
             fullrun: bool = False,
             nofail: bool = False,
+            gpgkey: str = 'stable',
+            gpg_check: bool = True,
+            repo_gpg_check: bool = True,
+            extra_dnf_args=None,
+            reposync_clean_old: bool = False,
             logger=None
         ):
         self.nofail = nofail
@@ -1598,24 +1716,49 @@ class SigRepoSync:
         self.repo_base_url = config['repo_base_url']
         self.compose_root = config['compose_root']
         self.compose_base = config['compose_root'] + "/" + major
-        self.profile = rlvars['profile']
+        self.profile = sigvars['profile']
         self.sigprofile = sigvars['profile']
         self.iso_map = rlvars['iso_map']
         self.distname = config['distname']
         self.fullname = rlvars['fullname']
         self.shortname = config['shortname']
+        self.fullversion = rlvars['revision']
+        self.sigrepo = repo
+        self.checksum = rlvars['checksum']
+        self.gpg_check = gpg_check
+        self.repo_gpg_check = repo_gpg_check
 
         # Relevant major version items
         self.sigvars = sigvars
-        self.sigrepos = sigvars.keys()
+        self.sigrepos = sigvars['repo'].keys()
+        self.extra_files = sigvars['extra_files']
+        self.gpgkey = gpgkey
         #self.arches = sigvars['allowed_arches']
-        #self.project_id = sigvars['project_id']
-        self.sigrepo = repo
+        self.project_id = sigvars['project_id']
+        if 'additional_dirs' in sigvars:
+            self.additional_dirs = sigvars['additional_dirs']
+
+        self.compose_id = '{}-{}-{}'.format(
+                self.profile,
+                self.major_version,
+                config['date_stamp']
+        )
 
         # Templates
         file_loader = FileSystemLoader(f"{_rootdir}/templates")
         self.tmplenv = Environment(loader=file_loader)
 
+        # dnf args
+        dnf_args_to_add = []
+        if extra_dnf_args:
+            if '--delete' in extra_dnf_args:
+                raise SystemExit('Please use the --reposync-clean option instead.')
+
+            dnf_args_to_add.extend(extra_dnf_args.split(' '))
+
+        self.extra_dnf_args = dnf_args_to_add.copy()
+        self.reposync_clean_old = reposync_clean_old
+
         # each el can have its own designated container to run stuff in,
         # otherwise we'll just default to the default config.
         self.container = config['container']
@@ -1634,10 +1777,9 @@ class SigRepoSync:
         self.compose_latest_dir = os.path.join(
                 config['compose_root'],
                 major,
-                "latest-{}-{}-SIG-{}".format(
-                    self.shortname,
+                "latest-SIG-{}-{}".format(
+                    self.sigprofile,
                     major,
-                    self.sigprofile
                 )
         )
 
@@ -1670,11 +1812,508 @@ class SigRepoSync:
             self.log.addHandler(handler)
 
         self.log.info('sig reposync init')
-        self.log.info(major)
-        #self.dnf_config = Shared.generate_conf()
+        self.log.info(self.profile + ' ' + self.major_version)
+
+        # The repo name should be valid
+        if self.sigrepo is not None:
+            if self.sigrepo not in self.sigrepos:
+                self.log.error(
+                        Color.FAIL +
+                        'Invalid SIG repository: ' +
+                        self.profile +
+                        ' ' +
+                        self.sigrepo
+                )
 
     def run(self):
         """
         This runs the sig sync.
         """
-        pass
+        if self.fullrun and self.sigrepo:
+            self.log.error('WARNING: repo ignored when doing a full sync')
+        if self.fullrun and self.dryrun:
+            self.log.error('A full and dry run is currently not supported.')
+            raise SystemExit('\nA full and dry run is currently not supported.')
+
+        # This should create the initial compose dir and set the path.
+        # Otherwise, just use the latest link.
+        if self.fullrun:
+            simplename = 'SIG-' + self.sigprofile
+            generated_dir = Shared.generate_compose_dirs(
+                    self.compose_base,
+                    simplename,
+                    self.fullversion,
+                    self.date_stamp,
+                    self.log
+            )
+            work_root = os.path.join(
+                    generated_dir,
+                    'work'
+            )
+            sync_root = os.path.join(
+                    generated_dir,
+                    'compose'
+            )
+        else:
+            # Put in a verification here.
+            work_root = os.path.join(
+                    self.compose_latest_dir,
+                    'work'
+            )
+            sync_root = self.compose_latest_sync
+
+            # Verify if the link even exists
+            if not os.path.exists(self.compose_latest_dir):
+                self.log.error('!! Latest compose link is broken does not exist: %s' % self.compose_latest_dir)
+                self.log.error('!! Please perform a full run if you have not done so.')
+                raise SystemExit()
+
+        log_root = os.path.join(
+                work_root,
+                "logs",
+                self.date_stamp
+        )
+
+        global_work_root = os.path.join(
+                work_root,
+                "global",
+        )
+
+        sig_sync_root = os.path.join(
+                sync_root,
+                self.major_version,
+                self.sigprofile
+        )
+
+        self.dnf_config = Shared.generate_conf(
+                self.profile,
+                self.major_version,
+                self.sigrepos,
+                self.repo_base_url,
+                self.project_id,
+                self.hashed,
+                self.extra_files,
+                self.gpgkey,
+                self.gpg_check,
+                self.repo_gpg_check,
+                self.tmplenv,
+                self.log
+        )
+
+        # dnf config here
+        if self.dryrun:
+            self.log.error('Dry Runs are not supported just yet. Sorry!')
+            raise SystemExit()
+
+        if self.fullrun and self.refresh_extra_files:
+            self.log.warn(Color.WARN + 'A full run implies extra files are also deployed.')
+
+        self.sync(self.sigrepo, sync_root, work_root, log_root, global_work_root, self.arch)
+
+        if self.fullrun:
+            Shared.deploy_extra_files(self.extra_files, sig_sync_root, global_work_root, self.log)
+            Shared.symlink_to_latest(simplename, self.major_version,
+                    generated_dir, self.compose_latest_dir, self.log)
+
+        if self.refresh_extra_files and not self.fullrun:
+            Shared.deploy_extra_files(self.extra_files, sig_sync_root, global_work_root, self.log)
+
+    def sync(self, repo, sync_root, work_root, log_root, global_work_root, arch=None):
+        """
+        Calls out syncing of the repos. We generally sync each component of a
+        repo:
+            * each arch
+            * each arch debug
+            * each source
+
+        If paralel is true, we will run in podman.
+        """
+        # I think we need to do a bit of leg work here, there is a chance that
+        # a sig may have repos that have repos that are not applicable to all
+        # arches...
+        if self.parallel:
+            self.podman_sync(repo, sync_root, work_root, log_root, global_work_root, arch)
+        else:
+            Shared.dnf_sync(repo, sync_root, work_root, arch, self.log)
+
+        self.create_additional_dirs(sync_root)
+
+    def podman_sync(
+            self,
+            repo,
+            sync_root,
+            work_root,
+            log_root,
+            global_work_root,
+            arch
+        ):
+        """
+        This is for podman syncs
+
+        Create sync/root/work/entries
+        Generate scripts as needed into dir
+        Each container runs their own script
+        wait till all is finished
+        """
+        cmd = Shared.podman_cmd(self.log)
+        bad_exit_list = []
+        extra_dnf_args = ' '.join(self.extra_dnf_args.copy())
+        reposync_delete = '--delete' if self.reposync_clean_old else ''
+        self.log.info('Generating container entries')
+        entries_dir = os.path.join(work_root, "entries")
+        gpg_key_url = self.extra_files['git_raw_path'] + self.extra_files['gpg'][self.gpgkey]
+        if not os.path.exists(entries_dir):
+            os.makedirs(entries_dir, exist_ok=True)
+
+        # yeah, I know.
+        if not os.path.exists(global_work_root):
+            os.makedirs(global_work_root, exist_ok=True)
+
+        if not os.path.exists(log_root):
+            os.makedirs(log_root, exist_ok=True)
+
+        repos_to_sync = self.sigrepos
+        if repo and not self.fullrun:
+            repos_to_sync = [repo]
+
+        for r in repos_to_sync:
+            entry_name_list = []
+            repo_name = r
+            # Each repo can have specific allowed arches, based on the request
+            # of the SIG. What we also want to make sure is that if an arch was
+            # asked for but a repo (regardless if we are choosing a repo or not)
+            # we have to pass it with a warning.
+            arch_sync = self.sigvars['repo'][r]['allowed_arches'].copy()
+            if arch:
+                arch_sync = [arch]
+
+            for a in arch_sync:
+                entry_name = '{}-{}'.format(r, a)
+                debug_entry_name = '{}-debug-{}'.format(r, a)
+
+                entry_name_list.append(entry_name)
+                if not self.ignore_debug and not a == 'source':
+                    entry_name_list.append(debug_entry_name)
+
+                entry_point_sh = os.path.join(
+                        entries_dir,
+                        entry_name
+                )
+
+                debug_entry_point_sh = os.path.join(
+                        entries_dir,
+                        debug_entry_name
+                )
+
+                os_sync_path = os.path.join(
+                        sync_root,
+                        self.major_version,
+                        self.profile,
+                        a,
+                        r
+                )
+
+                debug_sync_path = os.path.join(
+                        sync_root,
+                        self.major_version,
+                        self.profile,
+                        a,
+                        r + '-debug'
+                )
+
+                import_gpg_cmd = ("/usr/bin/rpm --import {}").format(gpg_key_url)
+
+                arch_force_cp = ("/usr/bin/sed 's|$basearch|{}|g' {} > {}.{}".format(
+                    a,
+                    self.dnf_config,
+                    self.dnf_config,
+                    a
+                ))
+
+                sync_log = ("{}/{}-{}.log").format(
+                        log_root,
+                        repo_name,
+                        a
+                )
+
+                debug_sync_log = ("{}/{}-{}-debug.log").format(
+                        log_root,
+                        repo_name,
+                        a
+                )
+
+                metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={} "
+                        "--forcearch {} --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        a
+                )
+
+                sync_cmd = ("/usr/bin/dnf reposync -c {}.{} --download-metadata "
+                        "--repoid={} -p {} --forcearch {} --norepopath --remote-time "
+                        "--gpgcheck --assumeyes {} 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        os_sync_path,
+                        a,
+                        reposync_delete
+                )
+
+                debug_metadata_cmd = ("/usr/bin/dnf makecache -c {}.{} --repoid={}-debug "
+                        "--forcearch {} --assumeyes 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        a
+                )
+
+
+                debug_sync_cmd = ("/usr/bin/dnf reposync -c {}.{} "
+                        "--download-metadata --repoid={}-debug -p {} --forcearch {} "
+                        "--gpgcheck --norepopath --remote-time --assumeyes {} 2>&1").format(
+                        self.dnf_config,
+                        a,
+                        r,
+                        debug_sync_path,
+                        a,
+                        reposync_delete
+                )
+
+                dnf_plugin_cmd = "/usr/bin/dnf install dnf-plugins-core -y"
+
+                sync_template = self.tmplenv.get_template('reposync.tmpl')
+                sync_output = sync_template.render(
+                        import_gpg_cmd=import_gpg_cmd,
+                        arch_force_cp=arch_force_cp,
+                        dnf_plugin_cmd=dnf_plugin_cmd,
+                        sync_cmd=sync_cmd,
+                        metadata_cmd=metadata_cmd,
+                        sync_log=sync_log,
+                        download_path=os_sync_path,
+                        gpg_key_url=gpg_key_url,
+                        deploy_extra_files=True
+                )
+
+                debug_sync_template = self.tmplenv.get_template('reposync.tmpl')
+                debug_sync_output = debug_sync_template.render(
+                        import_gpg_cmd=import_gpg_cmd,
+                        arch_force_cp=arch_force_cp,
+                        dnf_plugin_cmd=dnf_plugin_cmd,
+                        sync_cmd=debug_sync_cmd,
+                        metadata_cmd=debug_metadata_cmd,
+                        sync_log=debug_sync_log,
+                        download_path=debug_sync_path,
+                        gpg_key_url=gpg_key_url,
+                        deploy_extra_files=True
+                )
+
+                entry_point_open = open(entry_point_sh, "w+")
+                debug_entry_point_open = open(debug_entry_point_sh, "w+")
+
+                entry_point_open.write(sync_output)
+                debug_entry_point_open.write(debug_sync_output)
+
+                entry_point_open.close()
+                debug_entry_point_open.close()
+
+                os.chmod(entry_point_sh, 0o755)
+                os.chmod(debug_entry_point_sh, 0o755)
+
+            # We ignoring sources?
+            if (not self.ignore_source and not arch) or (
+                    not self.ignore_source and arch == 'source'):
+                source_entry_name = '{}-source'.format(r)
+                entry_name_list.append(source_entry_name)
+
+                source_entry_point_sh = os.path.join(
+                        entries_dir,
+                        source_entry_name
+                )
+
+                source_sync_path = os.path.join(
+                        sync_root,
+                        self.major_version,
+                        self.profile,
+                        'source',
+                        r
+                )
+
+                source_sync_log = ("{}/{}-source.log").format(
+                        log_root,
+                        repo_name
+                )
+
+                source_metadata_cmd = ("/usr/bin/dnf makecache -c {} --repoid={}-source "
+                        "--assumeyes 2>&1").format(
+                        self.dnf_config,
+                        r
+                )
+
+                source_sync_cmd = ("/usr/bin/dnf reposync -c {} "
+                        "--download-metadata --repoid={}-source -p {} "
+                        "--gpgcheck --norepopath --remote-time --assumeyes {} 2>&1").format(
+                        self.dnf_config,
+                        r,
+                        source_sync_path,
+                        reposync_delete
+                )
+
+                source_sync_template = self.tmplenv.get_template('reposync-src.tmpl')
+                source_sync_output = source_sync_template.render(
+                        import_gpg_cmd=import_gpg_cmd,
+                        dnf_plugin_cmd=dnf_plugin_cmd,
+                        sync_cmd=source_sync_cmd,
+                        metadata_cmd=source_metadata_cmd,
+                        sync_log=source_sync_log,
+                        download_path=debug_sync_path,
+                        gpg_key_url=gpg_key_url,
+                        deploy_extra_files=True
+                )
+
+                source_entry_point_open = open(source_entry_point_sh, "w+")
+                source_entry_point_open.write(source_sync_output)
+                source_entry_point_open.close()
+                os.chmod(source_entry_point_sh, 0o755)
+
+            # Spawn up all podman processes for repo
+            self.log.info(Color.INFO + 'Starting podman processes for %s ...' % r)
+
+            #print(entry_name_list)
+            for pod in entry_name_list:
+                podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}:z" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
+                        cmd,
+                        self.compose_root,
+                        self.compose_root,
+                        self.dnf_config,
+                        self.dnf_config,
+                        entries_dir,
+                        entries_dir,
+                        pod,
+                        entries_dir,
+                        pod,
+                        self.container
+                )
+                #print(podman_cmd_entry)
+                process = subprocess.call(
+                        shlex.split(podman_cmd_entry),
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                )
+
+            join_all_pods = ' '.join(entry_name_list)
+            time.sleep(3)
+            self.log.info(Color.INFO + 'Syncing ' + r + ' ...')
+            self.log.info(Color.INFO + 'Arches: ' + ' '.join(arch_sync))
+            pod_watcher = '{} wait {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            #print(pod_watcher)
+            watch_man = subprocess.call(
+                    shlex.split(pod_watcher),
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL
+            )
+
+            # After the above is done, we'll check each pod process for an exit
+            # code.
+            pattern = "Exited (0)"
+            for pod in entry_name_list:
+                checkcmd = '{} ps -f status=exited -f name={}'.format(
+                        cmd,
+                        pod
+                )
+                podcheck = subprocess.Popen(
+                        checkcmd,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        shell=True
+                )
+
+                output, errors = podcheck.communicate()
+                if 'Exited (0)' not in output.decode():
+                    self.log.error(Color.FAIL + pod)
+                    bad_exit_list.append(pod)
+
+            rmcmd = '{} rm {}'.format(
+                    cmd,
+                    join_all_pods
+            )
+
+            rmpod = subprocess.Popen(
+                    rmcmd,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL,
+                    shell=True
+            )
+
+            entry_name_list.clear()
+            self.log.info(Color.INFO + 'Syncing ' + r + ' completed')
+
+        if len(bad_exit_list) > 0:
+            self.log.error(
+                    Color.BOLD + Color.RED + 'There were issues syncing these '
+                    'repositories:' + Color.END
+            )
+            for issue in bad_exit_list:
+                self.log.error(issue)
+        else:
+            self.log.info(
+                    '[' + Color.BOLD + Color.GREEN + ' OK ' + Color.END + '] '
+                    'No issues detected.'
+            )
+
+    def deploy_metadata(self, sync_root):
+        """
+        Deploys metadata that defines information about the compose. Some data
+        will be close to how pungi produces it, but it won't be exact nor a
+        perfect replica.
+        """
+        self.log.info(Color.INFO + 'Deploying metadata for this compose')
+        # Create metadata here
+        # Create COMPOSE_ID here (this doesn't necessarily match anything, it's
+        # just an indicator)
+        metadata_dir = os.path.join(
+                sync_root,
+                "metadata"
+        )
+
+        # It should already exist from a full run or refresh. This is just in
+        # case and it doesn't hurt.
+        if not os.path.exists(metadata_dir):
+            os.makedirs(metadata_dir, exist_ok=True)
+
+        with open(metadata_dir + '/COMPOSE_ID', "w+") as f:
+            f.write(self.compose_id)
+            f.close()
+
+        Shared.write_metadata(
+                self.timestamp,
+                self.date_stamp,
+                self.distname,
+                self.fullversion,
+                self.compose_id,
+                metadata_dir + '/metadata'
+        )
+
+        # TODO: Add in each repo and their corresponding arch.
+        productmd_date = self.date_stamp.split('.')[0]
+        Shared.composeinfo_write(
+                metadata_dir + '/composeinfo',
+                self.distname,
+                self.shortname,
+                self.fullversion,
+                'updates',
+                productmd_date
+        )
+
+        self.log.info(Color.INFO + 'Metadata files phase completed.')
+
+    def create_additional_dirs(self, sync_root):
+        """
+        Creates additional directories
+        """
+        self.log.info(Color.INFO + 'Ensuring additional directories exist')
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index a098791..9d9faa2 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -61,6 +61,8 @@ class IsoBuild:
             extra_iso_mode: str = 'local',
             compose_dir_is_here: bool = False,
             hashed: bool = False,
+            updated_image: bool = False,
+            image_increment: str = '0',
             image=None,
             logger=None
     ):
@@ -93,13 +95,18 @@ class IsoBuild:
         self.checksum = rlvars['checksum']
         self.profile = rlvars['profile']
         self.hashed = hashed
+        self.updated_image = updated_image
+        self.updated_image_increment = "." + image_increment
+        self.updated_image_date = (time.strftime("%Y%m%d", time.localtime())
+                                   + self.updated_image_increment)
 
         # Relevant major version items
         self.arch = arch
         self.arches = rlvars['allowed_arches']
         self.release = rlvars['revision']
         self.minor_version = rlvars['minor']
-        self.revision = rlvars['revision'] + "-" + rlvars['rclvl']
+        self.revision_level = rlvars['revision'] + "-" + rlvars['rclvl']
+        self.revision = rlvars['revision']
         self.rclvl = rlvars['rclvl']
         self.repos = rlvars['iso_map']['lorax']['repos']
         self.repo_base_url = config['repo_base_url']
@@ -113,12 +120,6 @@ class IsoBuild:
         if 'container' in rlvars and len(rlvars['container']) > 0:
             self.container = rlvars['container']
 
-        self.staging_dir = os.path.join(
-                    config['staging_root'],
-                    config['category_stub'],
-                    self.revision
-        )
-
         # all bucket related info
         self.s3_region = config['aws_region']
         self.s3_bucket = config['bucket']
@@ -196,7 +197,7 @@ class IsoBuild:
                 self.compose_dir_is_here,
                 self.hashed
         )
-        self.log.info(self.revision)
+        self.log.info(self.revision_level)
 
     def run(self):
         work_root = os.path.join(
@@ -502,6 +503,7 @@ class IsoBuild:
             self.log.info('Removing boot.iso from %s' % image)
             try:
                 os.remove(path_to_image + '/images/boot.iso')
+                os.remove(path_to_image + '/images/boot.iso.manifest')
             except:
                 self.log.error(
                             '[' + Color.BOLD + Color.YELLOW + 'FAIL' + Color.END + '] ' +
@@ -509,21 +511,9 @@ class IsoBuild:
                 )
 
     def _copy_boot_to_work(self, force_unpack, arch):
-        src_to_image = os.path.join(
-                self.lorax_work_dir,
-                arch,
-                'lorax'
-        )
-
-        iso_to_go = os.path.join(
-                self.iso_work_dir,
-                arch
-        )
-
-        path_to_src_image = '{}/{}'.format(
-                src_to_image,
-                '/images/boot.iso'
-        )
+        src_to_image = os.path.join(self.lorax_work_dir, arch, 'lorax')
+        iso_to_go = os.path.join(self.iso_work_dir, arch)
+        path_to_src_image = os.path.join(src_to_image, 'images/boot.iso')
 
         rclevel = ''
         if self.release_candidate:
@@ -538,15 +528,13 @@ class IsoBuild:
                 'boot'
         )
 
-        isobootpath = '{}/{}'.format(
-                iso_to_go,
-                discname
-        )
-
-        manifest = '{}.{}'.format(
-                isobootpath,
-                'manifest'
-        )
+        isobootpath = os.path.join(iso_to_go, discname)
+        manifest = '{}.manifest'.format(isobootpath)
+        link_name = '{}-{}-boot.iso'.format(self.shortname, arch)
+        link_manifest = link_name + '.manifest'
+        isobootpath = os.path.join(iso_to_go, discname)
+        linkbootpath = os.path.join(iso_to_go, link_name)
+        manifestlink = os.path.join(iso_to_go, link_manifest)
 
         if not force_unpack:
             file_check = isobootpath
@@ -556,9 +544,18 @@ class IsoBuild:
 
         self.log.info('Copying %s boot iso to work directory...' % arch)
         os.makedirs(iso_to_go, exist_ok=True)
-        shutil.copy2(path_to_src_image, isobootpath)
+        try:
+            shutil.copy2(path_to_src_image, isobootpath)
+            if os.path.exists(linkbootpath):
+                os.remove(linkbootpath)
+            os.symlink(discname, linkbootpath)
+        except Exception as e:
+            self.log.error(Color.FAIL + 'We could not copy the image or create a symlink.')
+            raise SystemExit(e)
+
         if os.path.exists(path_to_src_image + '.manifest'):
             shutil.copy2(path_to_src_image + '.manifest', manifest)
+            os.symlink(manifest.split('/')[-1], manifestlink)
 
         self.log.info('Creating checksum for %s boot iso...' % arch)
         checksum = Shared.get_checksum(isobootpath, self.checksum, self.log)
@@ -569,6 +566,14 @@ class IsoBuild:
             c.write(checksum)
             c.close()
 
+        linksum = Shared.get_checksum(linkbootpath, self.checksum, self.log)
+        if not linksum:
+            self.log.error(Color.FAIL + linkbootpath + ' not found! Did we actually make the symlink?')
+            return
+        with open(linkbootpath + '.CHECKSUM', "w+") as l:
+            l.write(linksum)
+            l.close()
+
     def _copy_nondisc_to_repo(self, force_unpack, arch, repo):
         """
         Syncs data from a non-disc set of images to the appropriate repo. Repo
@@ -581,6 +586,13 @@ class IsoBuild:
                 'os'
         )
 
+        kspathway = os.path.join(
+                self.compose_latest_sync,
+                repo,
+                arch,
+                'kickstart'
+        )
+
         src_to_image = os.path.join(
                 self.lorax_work_dir,
                 arch,
@@ -614,6 +626,7 @@ class IsoBuild:
 
         try:
             shutil.copytree(src_to_image, pathway, copy_function=shutil.copy2, dirs_exist_ok=True)
+            shutil.copytree(src_to_image, kspathway, copy_function=shutil.copy2, dirs_exist_ok=True)
         except:
             self.log.error('%s already exists??' % repo)
 
@@ -769,11 +782,14 @@ class IsoBuild:
         mock_sh_template = self.tmplenv.get_template('extraisobuild.tmpl.sh')
         iso_template = self.tmplenv.get_template('buildExtraImage.tmpl.sh')
         xorriso_template = self.tmplenv.get_template('xorriso.tmpl.txt')
+        iso_readme_template = self.tmplenv.get_template('ISOREADME.tmpl')
 
         mock_iso_path = '/var/tmp/lorax-{}.cfg'.format(self.major_version)
         mock_sh_path = '{}/extraisobuild-{}-{}.sh'.format(entries_dir, arch, image)
         iso_template_path = '{}/buildExtraImage-{}-{}.sh'.format(entries_dir, arch, image)
         xorriso_template_path = '{}/xorriso-{}-{}.txt'.format(entries_dir, arch, image)
+        iso_readme_path = '{}/{}/README'.format(self.iso_work_dir, arch)
+        print(iso_readme_path)
 
         log_root = os.path.join(
                 work_root,
@@ -801,6 +817,10 @@ class IsoBuild:
         if self.release_candidate:
             rclevel = '-' + self.rclvl
 
+        datestamp = ''
+        if self.updated_image:
+            datestamp = '-' + self.updated_image_date
+
         volid = '{}-{}-{}{}-{}-{}'.format(
                 self.shortname,
                 self.major_version,
@@ -810,15 +830,17 @@ class IsoBuild:
                 volname
         )
 
-        isoname = '{}-{}.{}{}-{}-{}.iso'.format(
+        isoname = '{}-{}{}{}-{}-{}.iso'.format(
                 self.shortname,
-                self.major_version,
-                self.minor_version,
+                self.revision,
                 rclevel,
+                datestamp,
                 arch,
                 image
         )
 
+        generic_isoname = '{}-{}-{}.iso'.format(self.shortname, arch, image)
+
         lorax_pkg_cmd = '/usr/bin/dnf install {} -y {}'.format(
                 ' '.join(required_pkgs),
                 log_path_command
@@ -867,6 +889,7 @@ class IsoBuild:
                     isoname=isoname,
                     volid=volid,
                     graft=xorpoint,
+                    arch=arch,
             )
             xorriso_template_entry = open(xorriso_template_path, "w+")
             xorriso_template_entry.write(xorriso_template_output)
@@ -894,6 +917,11 @@ class IsoBuild:
                 make_manifest=make_manifest,
                 lorax_pkg_cmd=lorax_pkg_cmd,
                 isoname=isoname,
+                generic_isoname=generic_isoname,
+        )
+
+        iso_readme_template_output = iso_readme_template.render(
+                arch=arch
         )
 
         mock_iso_entry = open(mock_iso_path, "w+")
@@ -908,6 +936,10 @@ class IsoBuild:
         iso_template_entry.write(iso_template_output)
         iso_template_entry.close()
 
+        iso_readme_entry = open(iso_readme_path, "w+")
+        iso_readme_entry.write(iso_readme_template_output)
+        iso_readme_entry.close()
+
         os.chmod(mock_sh_path, 0o755)
         os.chmod(iso_template_path, 0o755)
 
@@ -943,6 +975,11 @@ class IsoBuild:
         isos_dir = os.path.join(work_root, "isos")
         bad_exit_list = []
         checksum_list = []
+
+        datestamp = ''
+        if self.updated_image:
+            datestamp = '-' + self.updated_image_date
+
         for i in images:
             entry_name_list = []
             image_name = i
@@ -956,17 +993,25 @@ class IsoBuild:
                 if self.release_candidate:
                     rclevel = '-' + self.rclvl
 
-                isoname = '{}/{}-{}.{}{}-{}-{}.iso'.format(
+                isoname = '{}/{}-{}{}{}-{}-{}.iso'.format(
                         a,
                         self.shortname,
-                        self.major_version,
-                        self.minor_version,
+                        self.revision,
                         rclevel,
+                        datestamp,
+                        a,
+                        i
+                )
+
+                genericname = '{}/{}-{}-{}.iso'.format(
+                        a,
+                        self.shortname,
                         a,
                         i
                 )
 
                 checksum_list.append(isoname)
+                checksum_list.append(genericname)
 
             for pod in entry_name_list:
                 podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
@@ -1358,6 +1403,7 @@ class IsoBuild:
 
                 source_path = latest_artifacts[arch]
                 drop_name = source_path.split('/')[-1]
+                checksum_name = drop_name + '.CHECKSUM'
                 full_drop = '{}/{}'.format(
                         image_arch_dir,
                         drop_name
@@ -1407,6 +1453,15 @@ class IsoBuild:
                         arch,
                         formattype
                 )
+                latest_path = latest_name.split('/')[-1]
+                latest_checksum = '{}/{}-{}-{}.latest.{}.{}.CHECKSUM'.format(
+                        image_arch_dir,
+                        self.shortname,
+                        self.major_version,
+                        imagename,
+                        arch,
+                        formattype
+                )
                 # For some reason python doesn't have a "yeah just change this
                 # link" part of the function
                 if os.path.exists(latest_name):
@@ -1414,6 +1469,17 @@ class IsoBuild:
 
                 os.symlink(drop_name, latest_name)
 
+                self.log.info('Creating checksum for latest symlinked image...')
+                shutil.copy2(checksum_drop, latest_checksum)
+                with open(latest_checksum, 'r') as link:
+                    checkdata = link.read()
+
+                checkdata = checkdata.replace(drop_name, latest_path)
+
+                with open(latest_checksum, 'w+') as link:
+                    link.write(checkdata)
+                    link.close()
+
         self.log.info(Color.INFO + 'Image download phase completed')
 
 
@@ -1436,6 +1502,8 @@ class LiveBuild:
             image=None,
             justcopyit: bool = False,
             force_build: bool = False,
+            updated_image: bool = False,
+            image_increment: str = '0',
             logger=None
     ):
 
@@ -1449,7 +1517,6 @@ class LiveBuild:
         self.major_version = major
         self.compose_dir_is_here = compose_dir_is_here
         self.date_stamp = config['date_stamp']
-        self.date = time.strftime("%Y%m%d", time.localtime())
         self.compose_root = config['compose_root']
         self.compose_base = config['compose_root'] + "/" + major
         self.current_arch = config['arch']
@@ -1483,6 +1550,11 @@ class LiveBuild:
         if 'container' in rlvars and len(rlvars['container']) > 0:
             self.container = rlvars['container']
 
+        self.updated_image = updated_image
+        self.updated_image_increment = "." + image_increment
+        self.date = (time.strftime("%Y%m%d", time.localtime())
+                                   + self.updated_image_increment)
+
         # Templates
         file_loader = FileSystemLoader(f"{_rootdir}/templates")
         self.tmplenv = Environment(loader=file_loader)
@@ -1643,16 +1715,17 @@ class LiveBuild:
         )
         required_pkgs = self.livemap['required_pkgs']
 
-        volid = '{}-{}-{}'.format(
+        volid = '{}-{}-{}-{}'.format(
                 self.shortname,
-                image,
-                self.release
+                self.major_version,
+                self.minor_version,
+                image
         )
 
         isoname = '{}-{}-{}-{}-{}.iso'.format(
                 self.shortname,
-                image,
                 self.release,
+                image,
                 self.current_arch,
                 self.date
         )
@@ -1865,11 +1938,18 @@ class LiveBuild:
         live_dir_arch = os.path.join(self.live_work_dir, arch)
         isoname = '{}-{}-{}-{}-{}.iso'.format(
                 self.shortname,
-                image,
                 self.release,
+                image,
                 arch,
                 self.date
         )
+        isolink = '{}-{}-{}-{}-{}.iso'.format(
+                self.shortname,
+                self.major_version,
+                image,
+                arch,
+                'latest'
+        )
         live_res_dir = '/var/lib/mock/{}-{}-{}/result'.format(
                 self.shortname.lower(),
                 self.major_version,
@@ -1907,8 +1987,17 @@ class LiveBuild:
             self.log.info(Color.INFO + 'Copying image to work directory')
             source_path = os.path.join(live_res_dir, isoname)
             dest_path = os.path.join(live_dir_arch, isoname)
+            link_path = os.path.join(live_dir_arch, isolink)
             os.makedirs(live_dir_arch, exist_ok=True)
-            shutil.copy2(source_path, dest_path)
+            try:
+                shutil.copy2(source_path, dest_path)
+                if os.path.exists(link_path):
+                    os.remove(link_path)
+                os.symlink(isoname, link_path)
+            except:
+                self.log.error(Color.FAIL + 'We could not copy the image or create a symlink.')
+                return
+
             self.log.info(Color.INFO + 'Generating checksum')
             checksum = Shared.get_checksum(dest_path, self.checksum, self.log)
             if not checksum:
@@ -1917,3 +2006,11 @@ class LiveBuild:
             with open(dest_path + '.CHECKSUM', "w+") as c:
                 c.write(checksum)
                 c.close()
+
+            linksum = Shared.get_checksum(link_path, self.checksum, self.log)
+            if not linksum:
+                self.log.error(Color.FAIL + link_path + ' not found. Did we copy it?')
+                return
+            with open(link_path + '.CHECKSUM', "w+") as c:
+                c.write(linksum)
+                c.close()
diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py
index 8155090..3923062 100644
--- a/iso/empanadas/empanadas/util/shared.py
+++ b/iso/empanadas/empanadas/util/shared.py
@@ -5,6 +5,7 @@ import json
 import hashlib
 import shlex
 import subprocess
+import shutil
 import yaml
 import requests
 import boto3
@@ -401,7 +402,21 @@ class Shared:
         return cmd
 
     @staticmethod
-    def generate_conf(data, logger, dest_path='/var/tmp') -> str:
+    def generate_conf(
+            shortname,
+            major_version,
+            repos,
+            repo_base_url,
+            project_id,
+            hashed,
+            extra_files,
+            gpgkey,
+            gpg_check,
+            repo_gpg_check,
+            templates,
+            logger,
+            dest_path='/var/tmp'
+        ) -> str:
         """
         Generates the necessary repo conf file for the operation. This repo
         file should be temporary in nature. This will generate a repo file
@@ -413,35 +428,35 @@ class Shared:
         """
         fname = os.path.join(
                 dest_path,
-                "{}-{}-config.repo".format(data.shortname, data.major_version)
+                "{}-{}-config.repo".format(shortname, major_version)
         )
-        data.log.info('Generating the repo configuration: %s' % fname)
+        logger.info('Generating the repo configuration: %s' % fname)
 
-        if data.repo_base_url.startswith("/"):
+        if repo_base_url.startswith("/"):
             logger.error("Local file syncs are not supported.")
             raise SystemExit(Color.BOLD + "Local file syncs are not "
                 "supported." + Color.END)
 
         prehashed = ''
-        if data.hashed:
+        if hashed:
             prehashed = "hashed-"
         # create dest_path
         if not os.path.exists(dest_path):
             os.makedirs(dest_path, exist_ok=True)
         config_file = open(fname, "w+")
         repolist = []
-        for repo in data.repos:
+        for repo in repos:
 
             constructed_url = '{}/{}/repo/{}{}/$basearch'.format(
-                    data.repo_base_url,
-                    data.project_id,
+                    repo_base_url,
+                    project_id,
                     prehashed,
                     repo,
             )
 
             constructed_url_src = '{}/{}/repo/{}{}/src'.format(
-                    data.repo_base_url,
-                    data.project_id,
+                    repo_base_url,
+                    project_id,
                     prehashed,
                     repo,
             )
@@ -450,12 +465,16 @@ class Shared:
                     'name': repo,
                     'baseurl': constructed_url,
                     'srcbaseurl': constructed_url_src,
-                    'gpgkey': data.extra_files['git_raw_path'] + data.extra_files['gpg'][data.gpgkey]
+                    'gpgkey': extra_files['git_raw_path'] + extra_files['gpg'][gpgkey]
             }
             repolist.append(repodata)
 
-        template = data.tmplenv.get_template('repoconfig.tmpl')
-        output = template.render(repos=repolist)
+        template = templates.get_template('repoconfig.tmpl')
+        output = template.render(
+                repos=repolist,
+                gpg_check=gpg_check,
+                repo_gpg_check=repo_gpg_check
+        )
         config_file.write(output)
 
         config_file.close()
@@ -821,7 +840,14 @@ class Shared:
             isokwargs["input_charset"] = None
 
         if opts['use_xorrisofs']:
-            cmd = ['/usr/bin/xorriso', '-dialog', 'on', '<', opts['graft_points']]
+            cmd = [
+                    '/usr/bin/xorriso',
+                    '-dialog',
+                    'on',
+                    '<',
+                    opts['graft_points'],
+                    '2>&1'
+            ]
         else:
             cmd = Shared.get_mkisofs_cmd(
                     opts['iso_name'],
@@ -937,7 +963,7 @@ class Shared:
         Write compose info similar to pungi.
 
         arches and repos may be better suited for a dictionary. that is a
-        future thing we will work on for 0.3.0.
+        future thing we will work on for 0.5.0.
         """
         cijson = file_path + '.json'
         ciyaml = file_path + '.yaml'
@@ -961,3 +987,90 @@ class Shared:
         with open(ciyaml, 'w+') as ymdump:
             yaml.dump(jsonData, ymdump)
             ymdump.close()
+
+    @staticmethod
+    def symlink_to_latest(shortname, major_version, generated_dir, compose_latest_dir, logger):
+        """
+        Emulates pungi and symlinks latest-Rocky-X
+        This link will be what is updated in full runs. Whatever is in this
+        'latest' directory is what is rsynced on to staging after completion.
+        This link should not change often.
+        """
+        try:
+            os.remove(compose_latest_dir)
+        except:
+            pass
+
+        logger.info('Symlinking to latest-{}-{}...'.format(shortname, major_version))
+        os.symlink(generated_dir, compose_latest_dir)
+
+    @staticmethod
+    def deploy_extra_files(extra_files, sync_root, global_work_root, logger):
+        """
+        deploys extra files based on info of rlvars including a
+        extra_files.json
+
+        might also deploy COMPOSE_ID and maybe in the future a metadata dir with
+        a bunch of compose-esque stuff.
+        """
+        #logger.info(Color.INFO + 'Deploying treeinfo, discinfo, and media.repo')
+
+        cmd = Shared.git_cmd(logger)
+        tmpclone = '/tmp/clone'
+        extra_files_dir = os.path.join(
+                global_work_root,
+                'extra-files'
+        )
+        metadata_dir = os.path.join(
+                sync_root,
+                "metadata"
+        )
+        if not os.path.exists(extra_files_dir):
+            os.makedirs(extra_files_dir, exist_ok=True)
+
+        if not os.path.exists(metadata_dir):
+            os.makedirs(metadata_dir, exist_ok=True)
+
+        clonecmd = '{} clone {} -b {} -q {}'.format(
+                cmd,
+                extra_files['git_repo'],
+                extra_files['branch'],
+                tmpclone
+        )
+
+        git_clone = subprocess.call(
+                shlex.split(clonecmd),
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL
+        )
+
+        logger.info(Color.INFO + 'Deploying extra files to work and metadata directories ...')
+
+        # Copy files to work root
+        for extra in extra_files['list']:
+            src = '/tmp/clone/' + extra
+            # Copy extra files to root of compose here also - The extra files
+            # are meant to be picked up by our ISO creation process and also
+            # exist on our mirrors.
+            try:
+                shutil.copy2(src, extra_files_dir)
+                shutil.copy2(src, metadata_dir)
+            except:
+                logger.warn(Color.WARN + 'Extra file not copied: ' + src)
+
+        try:
+            shutil.rmtree(tmpclone)
+        except OSError as e:
+            logger.error(Color.FAIL + 'Directory ' + tmpclone +
+                    ' could not be removed: ' + e.strerror
+            )
+
+    @staticmethod
+    def dnf_sync(repo, sync_root, work_root, arch, logger):
+        """
+        This is for normal dnf syncs. This is very slow.
+        """
+        logger.error('DNF syncing has been removed.')
+        logger.error('Please install podman and enable parallel')
+        raise SystemExit()
+
diff --git a/iso/empanadas/pyproject.toml b/iso/empanadas/pyproject.toml
index 20164a4..7dcc940 100644
--- a/iso/empanadas/pyproject.toml
+++ b/iso/empanadas/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "empanadas"
-version = "0.3.0"
+version = "0.4.0"
 description = "hand crafted ISOs with love and spice"
 authors = ["Louis Abel <label@rockylinux.org>", "Neil Hanlon <neil@rockylinux.org>"]
 
@@ -34,6 +34,7 @@ build-image = "empanadas.scripts.build_image:run"
 finalize_compose = "empanadas.scripts.finalize_compose:run"
 pull-cloud-image = "empanadas.scripts.pull_cloud_image:run"
 generate_compose = "empanadas.scripts.generate_compose:run"
+peridot_repoclosure = "empanadas.scripts.peridot_repoclosure:run"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/iso/empanadas/tests/test_empanadas.py b/iso/empanadas/tests/test_empanadas.py
index 195fc4b..2c23e85 100644
--- a/iso/empanadas/tests/test_empanadas.py
+++ b/iso/empanadas/tests/test_empanadas.py
@@ -2,4 +2,4 @@ from empanadas import __version__
 
 
 def test_version():
-    assert __version__ == '0.2.0'
+    assert __version__ == '0.4.0'
diff --git a/mangle/README.md b/mangle/README.md
index 6711deb..3aba9a4 100644
--- a/mangle/README.md
+++ b/mangle/README.md
@@ -1 +1 @@
-# Mirrormanager Mangling tools
+# Mirrormanager Mangling tools and other Accessories
diff --git a/mangle/common b/mangle/common
index 7b1d1a8..76056a9 100644
--- a/mangle/common
+++ b/mangle/common
@@ -7,3 +7,4 @@ LIST=${LIST:-mirrorlist}
 MIRRORLIST_BASE="http://mirrors.rockylinux.org/${LIST}"
 
 MIRROR_DISPLAY_COUNT=1
+GIT_URL="https://git.rockylinux.org"
diff --git a/mangle/generators/README.md b/mangle/generators/README.md
new file mode 100644
index 0000000..da5e026
--- /dev/null
+++ b/mangle/generators/README.md
@@ -0,0 +1,3 @@
+# Generators
+
+These help generate comps or other data we need for peridot or pungi
diff --git a/mangle/generators/common b/mangle/generators/common
new file mode 100644
index 0000000..9d102cc
--- /dev/null
+++ b/mangle/generators/common
@@ -0,0 +1,20 @@
+# To be sourced by scripts to use
+
+if [ -z "$RLVER" ]; then
+  echo "You must set RLVER."
+  exit 1
+fi
+
+PREPOPDROP="/tmp/prepopulate.json"
+VERSDROP="/tmp/versions.list"
+
+# Source Major common
+# Override: Not Allowed
+test -f "$(dirname "${BASH_SOURCE[0]}")/common_${RLVER}" && source "$(dirname "${BASH_SOURCE[0]}")/common_${RLVER}"
+if [ "$?" -ne 0 ]; then
+  echo "Could not source common_${RLVER}"
+  exit 1
+fi
+
+STREAM_COMPOSE_BASEURL="https://composes.stream.centos.org/production"
+COMPOSE_BASEDIR="/mnt/compose"
diff --git a/mangle/generators/common.py b/mangle/generators/common.py
new file mode 100644
index 0000000..602e1f4
--- /dev/null
+++ b/mangle/generators/common.py
@@ -0,0 +1,31 @@
+class common:
+    def rlver(self, rlver):
+        default = "Not Supported"
+        return getattr(self, 'rl' + str(rlver), lambda: default)()
+
+    def rl8(self):
+        REPOS = {
+                'AppStream': ['aarch64', 'x86_64'],
+                'BaseOS': ['aarch64', 'x86_64'],
+                'HighAvailability': ['aarch64', 'x86_64'],
+                'PowerTools': ['aarch64', 'x86_64'],
+                'ResilientStorage': ['aarch64', 'x86_64'],
+                'RT': ['x86_64'],
+        }
+        return REPOS
+
+    def rl9(self):
+        REPOS = {
+                'AppStream': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                'BaseOS': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                'CRB': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                'HighAvailability': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                'NFV': ['x86_64'],
+                'ResilientStorage': ['ppc64le', 's390x', 'x86_64'],
+                'RT': ['x86_64'],
+                'SAP': ['ppc64le', 's390x', 'x86_64'],
+                'SAPHANA': ['ppc64le', 'x86_64']
+        }
+        return REPOS
+
+switcher = common()
diff --git a/mangle/generators/common_8 b/mangle/generators/common_8
new file mode 100644
index 0000000..3a979c6
--- /dev/null
+++ b/mangle/generators/common_8
@@ -0,0 +1,4 @@
+# To be sourced by scripts to use
+
+REPO=("BaseOS" "AppStream" "CRB" "HighAvailability" "ResilientStorage" "NFV" "RT")
+ARCH=("aarch64" "x86_64")
diff --git a/mangle/generators/common_9 b/mangle/generators/common_9
new file mode 100644
index 0000000..d48ac58
--- /dev/null
+++ b/mangle/generators/common_9
@@ -0,0 +1,4 @@
+# To be sourced by scripts to use
+
+REPO=("BaseOS" "AppStream" "CRB" "HighAvailability" "ResilientStorage" "NFV" "RT" "SAP" "SAPHANA")
+ARCH=("aarch64" "ppc64le" "s390x" "x86_64")
diff --git a/mangle/generators/generate_comps b/mangle/generators/generate_comps
new file mode 100755
index 0000000..10d8f80
--- /dev/null
+++ b/mangle/generators/generate_comps
@@ -0,0 +1,18 @@
+#!/bin/bash
+source common
+
+if [ ! -f "/usr/bin/pungi-koji" ]; then
+  echo "You must have pungi installed."
+  exit 1
+fi
+
+VER="${RLVER}"
+BRANCH="r${VER}"
+REPO="${GIT_URL}/rocky/pungi-rocky.git"
+
+CMD="/usr/bin/pungi-koji --production --no-latest-link --just-phase init --config rocky.conf --compose-dir /var/tmp/composes/ --label RC-${VER}"
+
+git clone ${REPO} -b ${BRANCH} /var/tmp/pungi
+pushd /var/tmp/pungi
+${CMD}
+popd
diff --git a/mangle/generators/generate_prepopulate_from_pungi b/mangle/generators/generate_prepopulate_from_pungi
new file mode 100755
index 0000000..25b75b0
--- /dev/null
+++ b/mangle/generators/generate_prepopulate_from_pungi
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Parses a local compose's repos
+#set -x
+
+if [ -n "$1" ] && [ -n "$2" ]; then
+  MAJOR=$1
+  DATE=$2
+else
+  echo "Major version not specified"
+  exit 1
+fi
+
+# Verify the date format
+echo "${DATE}" | grep -Eq '[0-9]+\.[0-9]'
+grep_val=$?
+
+if [ "$grep_val" -ne 0 ]; then
+  echo "Date format incorrect. You must use: YYYYMMDD.X"
+fi
+
+export RLVER=$MAJOR
+source common
+
+drop="${PREPOPDROP}"
+current=$(pwd)
+compose_dir="${COMPOSE_BASEDIR}/Rocky-${MAJOR}-${DATE}/compose"
+
+pushd "${compose_dir}" || { echo "Could not change directory"; exit 1; }
+/usr/bin/python3 "${current}/prepopulate_parser.py"
+ret_val=$?
+popd || { echo "Could not change back..."; exit 1; }
+
+if [ "$ret_val" -ne "0" ]; then
+  echo "There was an error running through the parser."
+  exit 1
+fi
+
+echo "File located at: $drop"
diff --git a/mangle/generators/generate_prepopulate_from_stream b/mangle/generators/generate_prepopulate_from_stream
new file mode 100755
index 0000000..a4f5ede
--- /dev/null
+++ b/mangle/generators/generate_prepopulate_from_stream
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Parses a CentOS Stream compose's repos
+#set -x
+
+if [ -n "$1" ] && [ -n "$2" ]; then
+  MAJOR=$1
+  DATE=$2
+else
+  echo "Major version not specified"
+  exit 1
+fi
+
+# Verify the date format
+echo "${DATE}" | grep -Eq '[0-9]+\.[0-9]'
+grep_val=$?
+
+if [ "$grep_val" -ne 0 ]; then
+  echo "Date format incorrect. You must use: YYYYMMDD.X"
+fi
+
+export RLVER=$MAJOR
+source common
+
+drop="${PREPOPDROP}"
+current=$(pwd)
+tmpdir=$(mktemp -d)
+stream_compose_url="${STREAM_COMPOSE_BASEURL}/CentOS-Stream-${MAJOR}-${DATE}/compose"
+
+pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
+for x in "${REPO[@]}"; do
+  echo "Working on ${x}"
+  for y in "${ARCH[@]}"; do
+    repodatas=( $(dnf reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
+    mkdir -p "${x}/${y}/repodata"
+    pushd "${x}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
+    for z in "${repodatas[@]}"; do
+      wget -q -nc "${z}"
+    done
+    wget -q -nc "${stream_compose_url}/${x}/${y}/os/repodata/repomd.xml"
+    popd || { echo "Could not change back..."; exit 1; }
+  done
+done
+/usr/bin/python3 "${current}/prepopulate_parser.py"
+ret_val=$?
+popd || { echo "Could not change back..."; exit 1; }
+
+if [ "$ret_val" -ne "0" ]; then
+  echo "There was an error running through the parser."
+  exit 1
+fi
+
+echo "File located at: $drop"
diff --git a/mangle/generators/generate_versions_from_stream b/mangle/generators/generate_versions_from_stream
new file mode 100755
index 0000000..bca3846
--- /dev/null
+++ b/mangle/generators/generate_versions_from_stream
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Parses a CentOS Stream compose's repos
+#set -x
+
+if [ -n "$1" ] && [ -n "$2" ]; then
+  MAJOR=$1
+  DATE=$2
+else
+  echo "Major version not specified"
+  exit 1
+fi
+
+# Verify the date format
+echo "${DATE}" | grep -Eq '[0-9]+\.[0-9]'
+grep_val=$?
+
+if [ "$grep_val" -ne 0 ]; then
+  echo "Date format incorrect. You must use: YYYYMMDD.X"
+fi
+
+export RLVER=$MAJOR
+source common
+
+drop="${VERSDROP}"
+current=$(pwd)
+tmpdir=$(mktemp -d)
+stream_compose_url="${STREAM_COMPOSE_BASEURL}/CentOS-Stream-${MAJOR}-${DATE}/compose"
+
+pushd "${tmpdir}" || { echo "Could not change directory"; exit 1; }
+for x in "${REPO[@]}"; do
+  echo "Working on ${x}"
+  for y in "${ARCH[@]}"; do
+    repodatas=( $(dnf reposync --repofrompath ${x},${stream_compose_url}/${x}/${y}/os --download-metadata --repoid=${x} -p ${x}/${y} --forcearch ${y} --norepopath --remote-time --assumeyes -u | grep repodata) )
+    mkdir -p "${x}/${y}/repodata"
+    pushd "${x}/${y}/repodata" || { echo "Could not change directory"; exit 1; }
+    for z in "${repodatas[@]}"; do
+      wget -q -nc "${z}"
+    done
+    wget -q -nc "${stream_compose_url}/${x}/${y}/os/repodata/repomd.xml"
+    popd || { echo "Could not change back..."; exit 1; }
+  done
+done
+/usr/bin/python3 "${current}/version_parser.py"
+ret_val=$?
+popd || { echo "Could not change back..."; exit 1; }
+
+if [ "$ret_val" -ne "0" ]; then
+  echo "There was an error running through the parser."
+  exit 1
+fi
+
+echo "File located at: $drop"
diff --git a/mangle/generators/prepopulate_parser.py b/mangle/generators/prepopulate_parser.py
new file mode 100755
index 0000000..43f9787
--- /dev/null
+++ b/mangle/generators/prepopulate_parser.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+import os
+import os.path
+import json
+import dnf
+import createrepo_c as cr
+from common import *
+
+REPOS = switcher.rlver((os.environ['RLVER']))
+
+# Source packages we do not ship or are rocky branded
+IGNORES = [
+        'insights-client',
+        'rhc',
+        'centos-indexhtml',
+        'centos-logos',
+        'centos-stream-release',
+        'redhat-indexhtml',
+        'redhat-logos',
+        'redhat-release'
+]
+
+def warningcb(warning_type, message):
+    print("WARNING: %s" % message)
+    return True
+
+repo_prepop = {}
+for k in REPOS:
+    repo_prepop[k] = {}
+    for arch in REPOS[k]:
+        PRIMARY_XML_PATH   = None
+        FILELISTS_XML_PATH = None
+        OTHER_XML_PATH     = None
+        REPO_PATH          = k + '/' + arch
+        repomd = cr.Repomd()
+        cr.xml_parse_repomd(os.path.join(REPO_PATH, "repodata/repomd.xml"), repomd, warningcb)
+        for record in repomd.records:
+            if record.type == "primary":
+                PRIMARY_XML_PATH = os.path.join(REPO_PATH, record.location_href)
+            elif record.type == "filelists":
+                FILELISTS_XML_PATH = os.path.join(REPO_PATH, record.location_href)
+            elif record.type == "other":
+                OTHER_XML_PATH = os.path.join(REPO_PATH, record.location_href)
+
+        package_iterator = cr.PackageIterator(primary_path=PRIMARY_XML_PATH, filelists_path=FILELISTS_XML_PATH, other_path=OTHER_XML_PATH, warningcb=warningcb)
+        repo_prepop[k][arch] = {}
+        for pkg in package_iterator:
+            name = pkg.name + '.' + pkg.arch
+            subject = dnf.subject.Subject(pkg.rpm_sourcerpm)
+            possible_nevra = subject.get_nevra_possibilities()
+            srcname = possible_nevra[0].name
+            # Ignore packages (by source) that we do not ship
+            if srcname in IGNORES:
+                continue
+
+            # Create the initial list if the package (by source) does not exist
+            if srcname not in repo_prepop[k][arch]:
+                repo_prepop[k][arch][srcname] = []
+
+            # Avoids duplicate entries - This is especially helpful for modules
+            if name not in repo_prepop[k][arch][srcname]:
+                repo_prepop[k][arch][srcname].append(name)
+
+            # Sorts the list items
+            repo_prepop[k][arch][srcname].sort()
+
+entry_point = open('/tmp/prepopulate.json', 'w+')
+json.dump(repo_prepop, entry_point, indent=2, sort_keys=True)
+entry_point.close()
diff --git a/mangle/generators/version_parser.py b/mangle/generators/version_parser.py
new file mode 100755
index 0000000..9491c52
--- /dev/null
+++ b/mangle/generators/version_parser.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+import os
+import os.path
+import json
+import dnf
+import createrepo_c as cr
+from common import *
+
+REPOS = switcher.rlver((os.environ['RLVER']))
+
+# Source packages we do not ship or are rocky branded
+IGNORES = [
+        'insights-client',
+        'rhc',
+        'centos-indexhtml',
+        'centos-logos',
+        'centos-stream-release',
+        'redhat-indexhtml',
+        'redhat-logos',
+        'redhat-release'
+]
+
+def warningcb(warning_type, message):
+    print("WARNING: %s" % message)
+    return True
+
+repo_prepop = {}
+with open('/tmp/versions.list', 'w+') as fp:
+    for k in REPOS:
+        repo_prepop[k] = {}
+        for arch in REPOS[k]:
+            PRIMARY_XML_PATH   = None
+            FILELISTS_XML_PATH = None
+            OTHER_XML_PATH     = None
+            REPO_PATH          = k + '/' + arch
+            repomd = cr.Repomd()
+            cr.xml_parse_repomd(os.path.join(REPO_PATH, "repodata/repomd.xml"), repomd, warningcb)
+            for record in repomd.records:
+                if record.type == "primary":
+                    PRIMARY_XML_PATH = os.path.join(REPO_PATH, record.location_href)
+                elif record.type == "filelists":
+                    FILELISTS_XML_PATH = os.path.join(REPO_PATH, record.location_href)
+                elif record.type == "other":
+                    OTHER_XML_PATH = os.path.join(REPO_PATH, record.location_href)
+
+            package_iterator = cr.PackageIterator(primary_path=PRIMARY_XML_PATH, filelists_path=FILELISTS_XML_PATH, other_path=OTHER_XML_PATH, warningcb=warningcb)
+            repo_prepop[k][arch] = {}
+            for pkg in package_iterator:
+                subject = dnf.subject.Subject(pkg.rpm_sourcerpm)
+                possible_nevra = subject.get_nevra_possibilities()
+                srcname = possible_nevra[0].name
+                srcvers = possible_nevra[0].version
+                srcrele = possible_nevra[0].release
+                full = srcname + '-' + srcvers + '-' + srcrele
+                # Ignore packages (by source) that we do not ship
+                if srcname in IGNORES:
+                    continue
+
+                # Create the initial list if the package (by source) does not exist
+                if srcname not in repo_prepop[k][arch]:
+                    repo_prepop[k][arch][srcname] = {}
+
+                # Avoids duplicate entries - This is especially helpful for modules
+                repo_prepop[k][arch][srcname]['version'] = srcvers
+                repo_prepop[k][arch][srcname]['release'] = srcrele
+
+                fp.write(full + '\n')
+    fp.close()
+
+entry_point = open('/tmp/versions.json', 'w+')
+json.dump(repo_prepop, entry_point, indent=2, sort_keys=True)
+entry_point.close()
diff --git a/sync/common b/sync/common
index be3c832..33c0852 100644
--- a/sync/common
+++ b/sync/common
@@ -22,6 +22,7 @@ PRODUCTION_ROOT="/mnt/repos-production"
 # Override: Not Allowed
 # relative to ${ENV}_ROOT
 CATEGORY_STUB="mirror/pub/rocky"
+SIG_CATEGORY_STUB="mirror/pub/sig"
 
 # Override: Required
 #RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}"
diff --git a/sync/sync-file-list-parallel.sh b/sync/sync-file-list-parallel.sh
new file mode 100644
index 0000000..48feb57
--- /dev/null
+++ b/sync/sync-file-list-parallel.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# Syncs everything from staging to production
+
+# Source common variables
+# shellcheck disable=SC2046,1091,1090
+source "$(dirname "$0")/common"
+
+REV=${REVISION}${APPEND_TO_DIR}
+
+cd "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+ret_val=$?
+
+if [ $ret_val -eq "0" ]; then
+  # Full file list update for rocky linux itself
+  echo "Starting full file list for category"
+  cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+  find . > "${PRODUCTION_ROOT}/${CATEGORY_STUB}/fullfilelist" & CATEPID=$!
+  echo "Starting full file list for root"
+  cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+  find . > "${PRODUCTION_ROOT}/fullfilelist" & ROOTPID=$!
+
+  wait $CATEPID
+  wait $ROOTPID
+
+  echo "Generating filelist for quick-fedora-mirror users"
+  if [[ -f /usr/local/bin/create-filelist ]]; then
+    # We're already here, but Justin Case wanted this
+    cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+    /usr/local/bin/create-filelist > fullfiletimelist-rocky & CREALIPID=$!
+
+    # We're already here, but Justin Case wanted this
+    cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+    /usr/local/bin/create-filelist > fullfiletimelist-rocky & ROOTLIPID=$!
+
+    wait $CREALIPID
+    wait $ROOTLIPID
+
+    cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+    chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist fullfiletimelist-rocky-linux
+    cp fullfiletimelist-rocky fullfiletimelist
+    cp fullfiletimelist-rocky fullfiletimelist-rocky-linux
+
+    cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+    chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
+    cp fullfiletimelist-rocky fullfiletimelist
+  fi
+
+fi
+
diff --git a/sync/sync-full-file-list.sh b/sync/sync-full-file-list.sh
new file mode 100644
index 0000000..517e213
--- /dev/null
+++ b/sync/sync-full-file-list.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Syncs everything from staging to production
+
+# Source common variables
+# shellcheck disable=SC2046,1091,1090
+source "$(dirname "$0")/common"
+
+REV=${REVISION}${APPEND_TO_DIR}
+
+cd "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+ret_val=$?
+
+if [ $ret_val -eq "0" ]; then
+  # Full file list update for rocky linux itself
+  cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+  # Hardlink everything except xml files
+  #hardlink -x '.*\.xml.*' "${REVISION}"
+  echo "Starting full file list for category"
+  find . > fullfilelist
+  echo "Generating filelist for quick-fedora-mirror users"
+  if [[ -f /usr/local/bin/create-filelist ]]; then
+    # We're already here, but Justin Case wanted this
+    cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+    /usr/local/bin/create-filelist > fullfiletimelist-rocky
+    cp fullfiletimelist-rocky fullfiletimelist
+    cp fullfiletimelist-rocky fullfiletimelist-rocky-linux
+  fi
+  chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist fullfiletimelist-rocky-linux
+fi
+
diff --git a/sync/sync-root-file-list.sh b/sync/sync-root-file-list.sh
new file mode 100644
index 0000000..5287003
--- /dev/null
+++ b/sync/sync-root-file-list.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Syncs everything from staging to production
+
+# Source common variables
+# shellcheck disable=SC2046,1091,1090
+source "$(dirname "$0")/common"
+
+REV=${REVISION}${APPEND_TO_DIR}
+
+cd "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+ret_val=$?
+
+if [ $ret_val -eq "0" ]; then
+  # Full file list update for production root
+  cd "${PRODUCTION_ROOT}/" || echo { echo "Failed to change directory"; exit 1; }
+  echo "Starting full file list for root"
+  find . > fullfilelist
+  echo "Generating filelist for quick-fedora-mirror users"
+  if [[ -f /usr/local/bin/create-filelist ]]; then
+    # We're already here, but Justin Case wanted this
+    cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+    /usr/local/bin/create-filelist > fullfiletimelist-rocky
+    cp fullfiletimelist-rocky fullfiletimelist
+  fi
+  chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
+fi
+
diff --git a/sync/sync-sig-file-list.sh b/sync/sync-sig-file-list.sh
new file mode 100644
index 0000000..821b56e
--- /dev/null
+++ b/sync/sync-sig-file-list.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Syncs everything from staging to production
+
+# Source common variables
+# shellcheck disable=SC2046,1091,1090
+source "$(dirname "$0")/common"
+
+REV=${REVISION}${APPEND_TO_DIR}
+
+cd "${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+ret_val=$?
+
+if [ $ret_val -eq "0" ]; then
+  # Full file list update for production root
+  cd "${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}" || { echo "Failed to change directory"; exit 1; }
+  echo "Starting full file list for root"
+  find . > fullfilelist
+  echo "Generating filelist for quick-fedora-mirror users"
+  if [[ -f /usr/local/bin/create-filelist ]]; then
+    # We're already here, but Justin Case wanted this
+    cd "${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}" || { echo "Failed to change directory"; exit 1; }
+    /bin/cp fullfiletimelist-sig fullfiletimelist-sig-old
+    /usr/local/bin/create-filelist > fullfiletimelist-sig
+    cp fullfiletimelist-sig fullfiletimelist
+  fi
+  chown 10004:10005 fullfilelist fullfiletimelist-sig fullfiletimelist
+fi
+
diff --git a/sync/sync-to-prod-9.sh b/sync/sync-to-prod-9.sh
index 1c90de1..7b54bc8 100644
--- a/sync/sync-to-prod-9.sh
+++ b/sync/sync-to-prod-9.sh
@@ -14,33 +14,34 @@ if [ $ret_val -eq "0" ]; then
   TARGET="${PRODUCTION_ROOT}/${CATEGORY_STUB}/${REV:0:3}"
   mkdir -p "${TARGET}"
   echo "Syncing ${REVISION}"
-  sudo -l && time fpsync -o '-av --numeric-ids --no-compress --chown=10004:10005' -n 24 -t /mnt/compose/partitions "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/" "${TARGET}/"
+  sudo -l && time fpsync -n 24 -o '-a --numeric-ids --no-compress --chown=10004:10005' -t /mnt/compose/partitions "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/" "${TARGET}/"
 
   # Full file list update for production root
-  cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
-  echo "Getting a full file list for the root dir"
-  find . > fullfilelist
-  if [[ -f /usr/local/bin/create-filelist ]]; then
-    # We're already here, but Justin Case wanted this
-    cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
-    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
-    /usr/local/bin/create-filelist > fullfiletimelist-rocky
-    cp fullfiletimelist-rocky fullfiletimelist
-  fi
-  # Full file list update for rocky linux itself
+  #cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+  #echo "Getting a full file list for the root dir"
+  #find . > fullfilelist
+  #if [[ -f /usr/local/bin/create-filelist ]]; then
+  #  # We're already here, but Justin Case wanted this
+  #  cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+  #  /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+  #  /usr/local/bin/create-filelist > fullfiletimelist-rocky
+  #  cp fullfiletimelist-rocky fullfiletimelist
+  #fi
+  ## Full file list update for rocky linux itself
   cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
-  # Hardlink everything except xml files
+  ## Hardlink everything except xml files
   echo "Hard linking"
   hardlink -x '.*\.xml.*' "${REVISION}"
-  echo "Getting a full file list for the rocky dir"
-  find . > fullfilelist
-  if [[ -f /usr/local/bin/create-filelist ]]; then
-    # We're already here, but Justin Case wanted this
-    cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
-    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
-    /usr/local/bin/create-filelist > fullfiletimelist-rocky
-    cp fullfiletimelist-rocky fullfiletimelist
-  fi
-  chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
+  #echo "Getting a full file list for the rocky dir"
+  #find . > fullfilelist
+  #if [[ -f /usr/local/bin/create-filelist ]]; then
+  #  # We're already here, but Justin Case wanted this
+  #  cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+  #  /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+  #  /usr/local/bin/create-filelist > fullfiletimelist-rocky
+  #  cp fullfiletimelist-rocky fullfiletimelist
+  #fi
+  #chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
+  echo "Syncing to prod completed. Please run the file list script."
 fi
 
diff --git a/sync/sync-to-prod-sig.sh b/sync/sync-to-prod-sig.sh
new file mode 100644
index 0000000..35bdbe8
--- /dev/null
+++ b/sync/sync-to-prod-sig.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Source common variables
+# shellcheck disable=SC2046,1091,1090
+source "$(dirname "$0")/common"
+
+#if [[ $# -eq 0 ]] || [[ $# -eq 1 ]]; then
+#  echo "Not enough information."
+#  echo "You must use: shortname sig"
+#  exit 1
+#fi
+
+cd "${STAGING_ROOT}/${SIG_CATEGORY_STUB}/${MAJOR}" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+ret_val=$?
+
+if [ $ret_val -eq "0" ]; then
+  TARGET=${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}/${MAJOR}/
+  mkdir -p "${TARGET}"
+  # disabling because none of our files should be starting with dashes. If they
+  # are something is *seriously* wrong here.
+  # shellcheck disable=SC2035
+  sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
+      {} "${TARGET}"
+
+  cd "${PRODUCTION_ROOT}/${SIG_CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+  echo "Hard linking"
+  hardlink -x '.*\.xml.*' "${MAJOR}"
+  echo "Syncing to prod completed. Please run the file list script."
+fi
diff --git a/sync/sync-to-prod.sh b/sync/sync-to-prod.sh
index 63b0048..d62db36 100644
--- a/sync/sync-to-prod.sh
+++ b/sync/sync-to-prod.sh
@@ -33,27 +33,29 @@ if [ $ret_val -eq "0" ]; then
   fi
 
   # Full file list update for production root
-  cd "${PRODUCTION_ROOT}/" || echo { echo "Failed to change directory"; exit 1; }
-  find . > fullfilelist
-  if [[ -f /usr/local/bin/create-filelist ]]; then
-    # We're already here, but Justin Case wanted this
-    cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
-    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
-    /usr/local/bin/create-filelist > fullfiletimelist-rocky
-    cp fullfiletimelist-rocky fullfiletimelist
-  fi
-  # Full file list update for rocky linux itself
+  #cd "${PRODUCTION_ROOT}/" || echo { echo "Failed to change directory"; exit 1; }
+  #find . > fullfilelist
+  #if [[ -f /usr/local/bin/create-filelist ]]; then
+  #  # We're already here, but Justin Case wanted this
+  #  cd "${PRODUCTION_ROOT}/" || { echo "Failed to change directory"; exit 1; }
+  #  /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+  #  /usr/local/bin/create-filelist > fullfiletimelist-rocky
+  #  cp fullfiletimelist-rocky fullfiletimelist
+  #fi
+  ## Full file list update for rocky linux itself
   cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
-  # Hardlink everything except xml files
+  ## Hardlink everything except xml files
+  echo "Hard linking"
   hardlink -x '.*\.xml.*' "${REVISION}"
-  find . > fullfilelist
-  if [[ -f /usr/local/bin/create-filelist ]]; then
-    # We're already here, but Justin Case wanted this
-    cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
-    /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
-    /usr/local/bin/create-filelist > fullfiletimelist-rocky
-    cp fullfiletimelist-rocky fullfiletimelist
-  fi
-  chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
+  #find . > fullfilelist
+  #if [[ -f /usr/local/bin/create-filelist ]]; then
+  #  # We're already here, but Justin Case wanted this
+  #  cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; }
+  #  /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old
+  #  /usr/local/bin/create-filelist > fullfiletimelist-rocky
+  #  cp fullfiletimelist-rocky fullfiletimelist
+  #fi
+  #chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist
+  echo "Syncing to prod completed. Please run the file list script."
 fi
 
diff --git a/sync/sync-to-staging-9.sh b/sync/sync-to-staging-9.sh
index a5d59df..4a745eb 100644
--- a/sync/sync-to-staging-9.sh
+++ b/sync/sync-to-staging-9.sh
@@ -26,7 +26,7 @@ if [ $ret_val -eq "0" ]; then
   # shellcheck disable=SC2035
   #sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
   #    {} "${TARGET}"
-  sudo -l && time fpsync -o '-av --numeric-ids --no-compress --chown=10004:10005' -n 24 -t /mnt/compose/partitions "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}${PROFILE}/compose/" "${TARGET}/"
+  sudo -l && time fpsync -n 24 -o '-a --numeric-ids --no-compress --chown=10004:10005' -t /mnt/compose/partitions "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}${PROFILE}/compose/" "${TARGET}/"
 
   # This is temporary until we implement rsync into empanadas
   #if [ -f "COMPOSE_ID" ]; then
diff --git a/sync/sync-to-staging-fpsync-testing.sh b/sync/sync-to-staging-fpsync-testing.sh
new file mode 100644
index 0000000..c449ebf
--- /dev/null
+++ b/sync/sync-to-staging-fpsync-testing.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Source common variables
+# shellcheck disable=SC2046,1091,1090
+source "$(dirname "$0")/common"
+
+if [[ $# -eq 0 ]]; then
+  echo "You must specify a short name."
+  exit 1
+fi
+
+# Major Version (eg, 8)
+MAJ=${RLVER}
+# Short name (eg, NFV, extras, Rocky, gluster9)
+SHORT=${1}
+PROFILE=${2}
+
+cd "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}${PROFILE}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+ret_val=$?
+
+if [ $ret_val -eq "0" ]; then
+  TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}"
+  mkdir -p "${TARGET}"
+  # disabling because none of our files should be starting with dashes. If they
+  # are something is *seriously* wrong here.
+  # shellcheck disable=SC2035
+  #sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
+  #    {} "${TARGET}"
+  sudo -l && time fpsync -n 18 -o '-a --numeric-ids --no-compress --chown=10004:10005' -t /mnt/compose/partitions "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}${PROFILE}/compose/" "${TARGET}/"
+
+  # This is temporary until we implement rsync into empanadas
+  #if [ -f "COMPOSE_ID" ]; then
+  #  cp COMPOSE_ID "${TARGET}"
+  #  chown 10004:10005 "${TARGET}/COMPOSE_ID"
+  #fi
+
+  #if [ -d "metadata" ]; then
+  #  rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}"
+  #fi
+fi
diff --git a/sync/sync-to-staging-sig.sh b/sync/sync-to-staging-sig.sh
index 0be3bcc..a7b729a 100644
--- a/sync/sync-to-staging-sig.sh
+++ b/sync/sync-to-staging-sig.sh
@@ -4,9 +4,9 @@
 # shellcheck disable=SC2046,1091,1090
 source "$(dirname "$0")/common"
 
-if [[ $# -eq 0 ]] || [[ $# -eq 1 ]]; then
+if [[ $# -eq 0 ]]; then
   echo "Not enough information."
-  echo "You must use: shortname sig"
+  echo "You must use: sig"
   exit 1
 fi
 
@@ -17,11 +17,11 @@ SHORT=${1}
 # Note, this should be lowercase. eg, storage.
 SIG=${2}
 
-cd "/mnt/compose/${MAJ}/latest-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+cd "/mnt/compose/${MAJ}/latest-SIG-${SHORT}-${MAJ}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
 ret_val=$?
 
 if [ $ret_val -eq "0" ]; then
-  TARGET=${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG}
+  TARGET=${STAGING_ROOT}/${SIG_CATEGORY_STUB}/
   mkdir -p "${TARGET}"
   # disabling because none of our files should be starting with dashes. If they
   # are something is *seriously* wrong here.