diff --git a/extras.conf b/extras.conf
index 50c6996..5804912 100644
--- a/extras.conf
+++ b/extras.conf
@@ -26,8 +26,6 @@ check_deps = False
 filter_packages = [
     ('^extras$', {
         '*': [
-            # We want to include rocky-stream-repos, but not duplicate these
-            # other subpackages of rocky-repos that are already in BaseOS.
             'rocky-gpg-keys',
             'rocky-repos',
         ],
diff --git a/plus.conf b/plus.conf
index 30f2f0a..6702064 100644
--- a/plus.conf
+++ b/plus.conf
@@ -3,13 +3,13 @@ release_short = "Plus"
 release_version = "8"
 release_is_layered = False
 
-variants_file='variants-Plus.xml'
+variants_file='variants-plus.xml'
 sigkeys = ['6D745A60']
 create_jigdo = False
 
 pkgset_source='koji'
 
-pkgset_koji_tag='dist-rocky8-plus'
+pkgset_koji_tag='dist-rocky8-plus-compose'
 gather_method = {
     '^.*': {                # For all variants
         'comps': 'deps',    # resolve dependencies for packages from comps file
diff --git a/r8-devel.conf b/r8-devel.conf
index d2d24f3..3844a10 100644
--- a/r8-devel.conf
+++ b/r8-devel.conf
@@ -2,7 +2,7 @@ from multilib import *
 from include-excludes import *
 
 # PRODUCT INFO 
-release_name = "Rocky Developmental" 
+release_name = "Rocky Development" 
 release_short = "Rocky-devel"
 release_version = "8"
 version = "8-devel"
@@ -81,7 +81,7 @@ create_jigdo = False
 
 
 buildinstall_skip = [
-    ("^(Devel|AppStream|PowerTools|HighAvailability)$", {
+    ("^(Devel|AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
        "*": True
        }),
 ]
@@ -93,50 +93,50 @@ variant_as_lookaside = [
 gather_lookaside_repos = [
     ("^Devel$", {
         "x86_64": [
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/x86_64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/x86_64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/x86_64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/x86_64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/x86_64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/x86_64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/x86_64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/x86_64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/x86_64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree",
         ],
         "ppc64": [
         ],
         "ppc64le": [
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/ppc64le/os",
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/ppc64le/os",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/ppc64le/os",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/ppc64le/os",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/ppc64le/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/ppc64le/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/ppc64le/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/ppc64le/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/ppc64le/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree",
         ],
         "s390x": [
         ],
         "aarch64": [
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/aarch64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/BaseOS/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/aarch64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/AppStream/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/aarch64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/PowerTools/source/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/aarch64/os",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/aarch64/os/debug/tree",
-            "file:///compose/trees/latest-Rocky-8/compose/HighAvailability/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/aarch64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/aarch64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/aarch64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/aarch64/os/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree",
         ],
     }),
 ]
diff --git a/variants-Plus.xml b/variants-plus.xml
similarity index 100%
rename from variants-Plus.xml
rename to variants-plus.xml