diff --git a/rocky.conf b/rocky.conf
index 5c87d56..e7e5f20 100644
--- a/rocky.conf
+++ b/rocky.conf
@@ -3,6 +3,10 @@ from rocky/variables import *
 from shared/all import *
 from rocky/override import *
 
+image_build = {}
+sigkeys = [None]
+signed_packages_wait = 0
+signed_packages_retries = 0
+
 global_release = '!RELEASE_FROM_DATE_RESPIN'
 
-sigkeys = [None]
diff --git a/rocky/variables.conf b/rocky/variables.conf
index f10801f..ef824a1 100644
--- a/rocky/variables.conf
+++ b/rocky/variables.conf
@@ -6,8 +6,7 @@ RELEASE_SHORT = 'Rocky'
 RELEASE_VERSION = '10'
 VERSION = '10-lh'
 
-PKGSET_KOJI_TAG = 'r10-compose'
-PKGSET_KOJI_MODULE_TAG = 'el9-modules-pending-signed'
+PKGSET_KOJI_TAG = 'r10-bootstrap'
 
 RUNROOT_CHANNEL = 'runroot'
 RUNROOT_TAG = 'r10-build'
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 8fe8305..d7070ac 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -38,6 +38,26 @@ filter_packages = [
 
 ]
 
+filter_modules = [
+    ("^AppStream$", {
+       "*":
+             [
+             "*",
+             ],
+           }),
+    ("^BaseOS$", {
+       "*":
+             [
+             "*",
+             ],
+           }),
+    ("^CRB$", {
+       "*":
+             [
+             "*",
+             ],
+           }),
+]
 
 additional_packages = [
     # Everything contains everything.
diff --git a/shared/buildinstall.conf b/shared/buildinstall.conf
index 5e4e38d..54b76d9 100644
--- a/shared/buildinstall.conf
+++ b/shared/buildinstall.conf
@@ -12,6 +12,7 @@ lorax_options = [
 
 buildinstall_skip = [
     EXTRA_BUILDINSTALL_SKIP,
+    ('^Modular$', {'*': True}),
     ('^Everything$', {
         'i386': True,
     }),
diff --git a/shared/createiso.conf b/shared/createiso.conf
index 8963457..455afab 100644
--- a/shared/createiso.conf
+++ b/shared/createiso.conf
@@ -2,6 +2,7 @@ create_optional_isos = False
 createiso_use_xorrisofs = True
 
 createiso_skip = [
+    ('^Modular$', {'*': True, 'src': True}),
     ("^(BaseOS|AppStream|CRB|NFV)$", {
         # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
         # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
diff --git a/shared/gather.conf b/shared/gather.conf
index f74af96..40691df 100644
--- a/shared/gather.conf
+++ b/shared/gather.conf
@@ -6,8 +6,13 @@ gather_method = {
     "^(?!(AppStream|CRB|Buildroot)).*$": {
         "comps": "deps",
         "json": "deps",
+        "modules": "nodeps",
+    },
+    "^(AppStream|CRB|Buildroot)$": {
+        "comps": "deps",
+        "json": "deps",
+        "modules": "nodeps",
     },
-    "^(AppStream|CRB|Buildroot)$": "hybrid",
 }
 
 hashed_directories = False
diff --git a/shared/general.conf b/shared/general.conf
index 8e3a960..18e26e6 100644
--- a/shared/general.conf
+++ b/shared/general.conf
@@ -20,13 +20,6 @@ comps_file = {
     'command': COMPS_COMMAND
 }
 
-module_defaults_dir = {
-    'scm': 'git',
-    'repo': MODULE_DEFAULTS_REPO,
-    'branch': MODULE_DEFAULTS_BRANCH,
-    'dir': '.'
-}
-
 variants_file = {
     "scm": "git",
     "repo": VARIANTS_REPO,
diff --git a/shared/pkgset.conf b/shared/pkgset.conf
index 020eb87..54bb236 100644
--- a/shared/pkgset.conf
+++ b/shared/pkgset.conf
@@ -1,5 +1,5 @@
 pkgset_source = "koji"
 pkgset_koji_tag = PKGSET_KOJI_TAG
-pkgset_koji_module_tag = PKGSET_KOJI_MODULE_TAG
+pkgset_koji_module_tag = ""
 
 pkgset_inherit_exclusive_arch_to_noarch = False
diff --git a/shared/variables.conf b/shared/variables.conf
index 54f9f6a..6e648ae 100644
--- a/shared/variables.conf
+++ b/shared/variables.conf
@@ -2,7 +2,6 @@ global RELEASE_NAME
 global RELEASE_SHORT
 global RELEASE_VERSION
 global PKGSET_KOJI_TAG
-global PKGSET_KOJI_MODULE_TAG
 global RUNROOT_CHANNEL
 global RUNROOT_TAG
 global RELEASE_VERSION
@@ -15,8 +14,6 @@ global COMPS_REPO
 global COMPS_BRANCH
 global COMPS_FILE
 global COMPS_COMMAND
-global MODULE_DEFAULTS_REPO
-global MODULE_DEFAULTS_BRANCH
 global VARIANTS_REPO
 global VARIANTS_BRANCH
 global VARIANTS_FILE
diff --git a/sync-from-upstream b/sync-from-upstream
index c3171bb..64eb382 100755
--- a/sync-from-upstream
+++ b/sync-from-upstream
@@ -11,7 +11,7 @@ if [[ ! "${BRANCH}" =~ "r10s" ]]; then
 fi
 
 echo "Fetching from upstream"
-git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-9-stream
+git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-10-stream
 echo "Formatting patch and applying..."
 git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
 echo "!! DIFF OF CHANGES !!"
diff --git a/variants.xml b/variants.xml
index a798e58..a4e8540 100644
--- a/variants.xml
+++ b/variants.xml
@@ -151,16 +151,6 @@
             <environment display_order="1">graphical-server-environment</environment>
             <environment display_order="4">workstation-product-environment</environment>
         </environments>
-        <modules>
-          <module>maven:3.8</module>
-          <module>nginx:1.22</module>
-          <module>nodejs:18</module>
-          <module>nodejs:20</module>
-          <module>php:8.1</module>      
-          <module>postgresql:15</module>
-          <module>redis:7</module>
-          <module>ruby:3.1</module>
-        </modules>
     </variant>
     <variant id="CRB" name="CodeReady Builder" type="variant">
         <arches>
@@ -173,9 +163,6 @@
         <groups>
             <group default="true">crb</group>
         </groups>
-        <modules>
-          <module>swig:4.1</module>      
-        </modules>
     </variant>