diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index 0695b7b..8a6d69a 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -17,8 +17,8 @@ release_version = '9.4'
 treeinfo_version = '9'
 
 extra_isos = {
-    "BaseOS": [{
-        "include_variants": ["AppStream", "Extras"],
+    "Certified": [{
+        #"include_variants": ["AppStream", "Extras"],
         #"filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
         "filename": "{release_short}-9.4-{arch}-{disc_type}{suffix}",
         "skip_src": True,
@@ -36,41 +36,5 @@ extra_isos = {
                 ]
             }
         ]
-    }],
-    "Minimal": [{
-        "include_variants": [],
-        "filename": "{release_short}-9.4-{arch}-minimal{suffix}",
-        "skip_src": True,
-        "arches": ['x86_64'],
-        "failable_arches": ['i386'],
-        "extra_files": [
-            {
-                'scm': 'git',
-                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
-                'file': [
-                    'SOURCES/EULA-SERVER',
-                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
-                ]
-            }
-        ]
-    }],
-    "Server": [{
-        "include_variants": [],
-        "filename": "{release_short}-9.4-{arch}-server{suffix}",
-        "skip_src": True,
-        "arches": ['x86_64'],
-        "failable_arches": ['i386'],
-        "extra_files": [
-            {
-                'scm': 'git',
-                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
-                'file': [
-                    'SOURCES/EULA-SERVER',
-                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
-                ]
-            }
-        ]
     }]
 }
diff --git a/msvsphere-i686/general.conf b/msvsphere-i686/general.conf
index de9fa36..e825afb 100644
--- a/msvsphere-i686/general.conf
+++ b/msvsphere-i686/general.conf
@@ -2,7 +2,7 @@
 comps_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.4',
+    'branch': 'i9.4-certified',
     'file': 'comps.xml',
     'command': ''
 }
@@ -14,7 +14,7 @@ comps_file = {
 variants_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.4',
+    'branch': 'i9.4-certified',
     'file': 'variants-i686.xml',
     'command': ''
 }
@@ -52,7 +52,7 @@ repoclosure_backend = 'dnf'
 gather_prepopulate = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
-    'branch': 'i9.4',
+    'branch': 'i9.4-certified',
     'file': 'prepopulate-i686.json',
     'command': ''
 }
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index 705c138..54e6811 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -2,7 +2,7 @@
 comps_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.4',
+    'branch': 'i9.4-certified',
     'file': 'comps.xml',
     'command': ''
 }
@@ -14,7 +14,7 @@ comps_file = {
 variants_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.4',
+    'branch': 'i9.4-certified',
     'file': 'variants.xml',
     'command': ''
 }
@@ -52,7 +52,7 @@ repoclosure_backend = 'dnf'
 gather_prepopulate = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
-    'branch': 'i9.4',
+    'branch': 'i9.4-certified',
     'file': 'prepopulate.json',
     'command': ''
 }