diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml
index b78f7f6..a011d95 100644
--- a/iso/empanadas/empanadas/configs/el8.yaml
+++ b/iso/empanadas/empanadas/configs/el8.yaml
@@ -28,12 +28,10 @@
     - 'extras'
     - 'devel'
     - 'plus'
-    - 'rockyrpi'
   no_comps_or_groups:
     - 'extras'
     - 'devel'
     - 'plus'
-    - 'rockyrpi'
   comps_or_groups:
     - 'BaseOS'
     - 'AppStream'
diff --git a/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh b/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh
index 841987a..6a44528 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 }}/staging || { echo "Could not change directory"; exit 1; }
 fi
 ksflatten -c {{ ks_file }} -o /builddir/ks.cfg
 if [ $? -ne 0 ]; then