diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index 6fb9722..2d7f814 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -25,14 +25,12 @@ extra_isos = {
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
         "extra_files": [
-            {   
-                'scm': 'git',
-                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
+            {
+                'scm': 'file',
+                'repo': '',
                 'file': [
-                    'SOURCES/EULA-ARM',
-                    'SOURCES/EULA-SERVER',
-                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
+                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9-Test-Key',
+                    '/usr/share/sphere-release/EULA-SERVER',
                 ]
             }
         ]
@@ -45,12 +43,11 @@ extra_isos = {
         "failable_arches": ['i386'],
         "extra_files": [
             {
-                'scm': 'git',
-                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
+                'scm': 'file',
+                'repo': '',
                 'file': [
-                    'SOURCES/EULA-SERVER',
-                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
+                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9-Test-Key',
+                    '/usr/share/sphere-release/EULA-SERVER',
                 ]
             }
         ]
@@ -63,12 +60,11 @@ extra_isos = {
         "failable_arches": ['i386'],
         "extra_files": [
             {
-                'scm': 'git',
-                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
+                'scm': 'file',
+                'repo': '',
                 'file': [
-                    'SOURCES/EULA-SERVER',
-                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
+                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9-Test-Key',
+                    '/usr/share/sphere-release/EULA-SERVER',
                 ]
             }
         ]
diff --git a/msvsphere-i686/general.conf b/msvsphere-i686/general.conf
index dce6c13..72b990f 100644
--- a/msvsphere-i686/general.conf
+++ b/msvsphere-i686/general.conf
@@ -1,34 +1,13 @@
 # use a remote comps.xml file from a git repository
-comps_file = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3',
-    'file': 'comps.xml',
-    'command': ''
-}
-
 # alternatively, it's possible to use a local groups file
-#comps_file = 'comps.xml'
+comps_file = 'comps.xml'
 
 # use a remote variants.xml file from a git repository
-variants_file = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3-aicc',
-    'file': 'variants-i686.xml',
-    'command': ''
-}
-
 # alternatively, it's possible to use a local variants file
-#variants_file = 'variants.xml'
+variants_file = 'variants-i686.xml'
 
 # use modulemd-defaults from a git repository
-module_defaults_dir = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
-    'branch': 'i9',
-    'dir': '.'
-}
+module_defaults_dir = 'module-defaults'
 
 gather_backend = 'dnf'
 
@@ -49,13 +28,7 @@ gather_allow_reuse = True
 repoclosure_backend = 'dnf'
 
 # extra packages to be added
-gather_prepopulate = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
-    'branch': 'i9.3',
-    'file': 'prepopulate-i686.json',
-    'command': ''
-}
+gather_prepopulate = 'prepopulate-i686.json'
 
 greedy_method = "build"
 
@@ -66,7 +39,7 @@ pkgset_source = 'koji'
 #pkgset_koji_tag = ['inferit-9_3-init', 'inferit-9_3-extras', 'inferit-9-devel']
 pkgset_koji_tag = ['inferit-9-bootstrap']
 # add modules from those tags to compose
-#pkgset_koji_module_tag = ['inferit-9_3-module-init']
+pkgset_koji_module_tag = ['inferit-9-bootstrap-modules']
 pkgset_allow_reuse = True
 koji_profile = 'koji'
 runroot_method = "local"
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index 789d522..9572861 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -1,34 +1,13 @@
 # use a remote comps.xml file from a git repository
-comps_file = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3',
-    'file': 'comps.xml',
-    'command': ''
-}
-
 # alternatively, it's possible to use a local groups file
-#comps_file = 'comps.xml'
+comps_file = 'comps.xml'
 
 # use a remote variants.xml file from a git repository
-variants_file = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3-aicc',
-    'file': 'variants.xml',
-    'command': ''
-}
-
 # alternatively, it's possible to use a local variants file
-#variants_file = 'variants.xml'
+variants_file = 'variants.xml'
 
 # use modulemd-defaults from a git repository
-module_defaults_dir = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/module-defaults.git',
-    'branch': 'i9',
-    'dir': '.'
-}
+module_defaults_dir = 'module-defaults'
 
 gather_backend = 'dnf'
 
@@ -49,13 +28,7 @@ gather_allow_reuse = True
 repoclosure_backend = 'dnf'
 
 # extra packages to be added
-gather_prepopulate = {
-    'scm': 'git',
-    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
-    'branch': 'i9.3',
-    'file': 'prepopulate.json',
-    'command': ''
-}
+gather_prepopulate = 'prepopulate.json'
 
 greedy_method = "build"
 
@@ -66,7 +39,7 @@ pkgset_source = 'koji'
 #pkgset_koji_tag = ['inferit-9_3-init', 'inferit-9_3-extras', 'inferit-9-devel']
 pkgset_koji_tag = ['inferit-9-bootstrap']
 # add modules from those tags to compose
-#pkgset_koji_module_tag = ['inferit-9_3-module-init']
+pkgset_koji_module_tag = ['inferit-9-bootstrap-modules']
 pkgset_allow_reuse = True
 koji_profile = 'koji'
 runroot_method = "local"
diff --git a/variants-i686.xml b/variants-i686.xml
index 54731f4..f9d36d2 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -127,16 +127,16 @@
       <environment display_order="99">virtualization-host-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>postgresql:15</module> -->
-      <!-- <module>php:8.1</module> -->
-      <!-- <module>redis:7</module> -->
-      <!-- <module>ruby:3.1</module> -->
-    <!-- </modules> -->
+    <modules>
+      <module>maven:3.8</module>
+      <module>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>postgresql:15</module>
+      <module>php:8.1</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
@@ -145,9 +145,9 @@
     <groups>
       <group default="false">crb</group>
     </groups>
-    <!-- <modules> -->
-      <!-- <module>swig:4.1</module> -->
-    <!-- </modules> -->
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
   </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
diff --git a/variants.xml b/variants.xml
index aa7368d..391d791 100644
--- a/variants.xml
+++ b/variants.xml
@@ -127,16 +127,16 @@
       <environment display_order="99">virtualization-host-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>postgresql:15</module> -->
-      <!-- <module>php:8.1</module> -->
-      <!-- <module>redis:7</module> -->
-      <!-- <module>ruby:3.1</module> -->
-    <!-- </modules> -->
+    <modules>
+      <module>maven:3.8</module>
+      <module>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>postgresql:15</module>
+      <module>php:8.1</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
@@ -145,9 +145,9 @@
     <groups>
       <group default="false">crb</group>
     </groups>
-    <!-- <modules> -->
-      <!-- <module>swig:4.1</module> -->
-    <!-- </modules> -->
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
   </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>