diff --git a/comps.xml b/comps.xml
index 7689fe1..dc8517b 100644
--- a/comps.xml
+++ b/comps.xml
@@ -2,23 +2,13 @@
 <!DOCTYPE comps PUBLIC "-//MSVSphere//DTD Comps info//EN" "comps.dtd">
 <comps>
   <group variant="Certified">
-    <id>sphere-core-server</id>
-    <name>Core Server</name>
-    <description>Release files for Server</description>
+    <id>sphere-core-certified</id>
+    <name>Core Certified</name>
+    <description>Release files for Certified</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Certified" type="mandatory">sphere-release-identity-server</packagereq>
-    </packagelist>
-  </group>
-  <group variant="Certified">
-    <id>sphere-core-arm</id>
-    <name>Core ARM</name>
-    <description>Release files for ARM</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="Certified" type="mandatory">sphere-release-identity-arm</packagereq>
+      <packagereq variant="Certified" type="mandatory">sphere-release-identity-certified</packagereq>
     </packagelist>
   </group>
   <group variant="Certified">
@@ -7849,7 +7839,7 @@
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>server-product</groupid>
-      <groupid>sphere-core-server</groupid>
+      <groupid>sphere-core-certified</groupid>
       <groupid>standard</groupid>
     </grouplist>
     <optionlist>
@@ -7903,7 +7893,7 @@
       <groupid>headless-management</groupid>
       <groupid>server-product</groupid>
       <groupid>standard</groupid>
-      <groupid>sphere-core-server</groupid>
+      <groupid>sphere-core-certified</groupid>
     </grouplist>
     <optionlist>
       <groupid>debugging</groupid>
@@ -7983,7 +7973,7 @@
     <display_order>3</display_order>
     <grouplist>
       <groupid>core</groupid>
-      <groupid>sphere-core-server</groupid>
+      <groupid>sphere-core-certified</groupid>
     </grouplist>
     <optionlist>
       <groupid>guest-agents</groupid>
@@ -8027,7 +8017,7 @@
       <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>print-client</groupid>
-      <groupid>sphere-core-arm</groupid>
+      <groupid>sphere-core-certified</groupid>
       <groupid>standard</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
@@ -8071,7 +8061,7 @@
     <display_order>99</display_order>
     <grouplist>
       <groupid>core</groupid>
-      <groupid>sphere-core-server</groupid>
+      <groupid>sphere-core-certified</groupid>
     </grouplist>
     <optionlist>
       <groupid>guest-agents</groupid>
@@ -8138,7 +8128,7 @@
     <grouplist>
       <groupid>base</groupid>
       <groupid>core</groupid>
-      <groupid>sphere-core-server</groupid>
+      <groupid>sphere-core-certified</groupid>
       <groupid>standard</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>virtualization-tools</groupid>
diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index a3faf56..8aa7dcc 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -27,10 +27,9 @@ extra_isos = {
             {   
                 'scm': 'git',
                 'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
-                'branch': 'i9',
+                'branch': 'i9-certified',
                 'file': [
-                    'SOURCES/EULA-ARM',
-                    'SOURCES/EULA-SERVER',
+                    'SOURCES/EULA-CERTIFIED',
                     'SOURCES/RPM-GPG-KEY-MSVSphere-9'
                 ]
             }
diff --git a/msvsphere-i686/filter_packages.conf b/msvsphere-i686/filter_packages.conf
index 11d1011..2c6090e 100644
--- a/msvsphere-i686/filter_packages.conf
+++ b/msvsphere-i686/filter_packages.conf
@@ -6,8 +6,12 @@ filter_packages = [
                 "nginx-mod-devel",
                 "selinux-policy-minimum",
                 "sphere-release-cinnamon",
+                "sphere-release-arm",
+                "sphere-release-server",
                 "sphere-release-el",
                 "sphere-release-identity-cinnamon",
+                "sphere-release-identity-arm",
+                "sphere-release-identity-server",
                 "sphere-release-identity-kde",
                 "sphere-release-identity-xfce",
                 "sphere-release-kde",
diff --git a/msvsphere/filter_packages.conf b/msvsphere/filter_packages.conf
index e95bd25..e1178a5 100644
--- a/msvsphere/filter_packages.conf
+++ b/msvsphere/filter_packages.conf
@@ -27,8 +27,12 @@ filter_packages = [
                 "qca",
                 "selinux-policy-minimum",
                 "sphere-release-cinnamon",
+                "sphere-release-arm",
+                "sphere-release-server",
                 "sphere-release-el",
                 "sphere-release-identity-cinnamon",
+                "sphere-release-identity-server",
+                "sphere-release-identity-arm",
                 "sphere-release-identity-kde",
                 "sphere-release-identity-xfce",
                 "sphere-release-kde",
diff --git a/prepopulate-i686.json b/prepopulate-i686.json
index 1508f3d..0751ba8 100644
--- a/prepopulate-i686.json
+++ b/prepopulate-i686.json
@@ -21974,23 +21974,15 @@
         "speex-tools.i686"
       ],
       "sphere-release": [
-        "sphere-release-identity-server.i686",
+        "sphere-release-identity-certified.i686",
         "sphere-repos.i686",
         "sphere-release-common.i686",
-        "sphere-release-identity-arm.i686",
         "sphere-sb-certs.i686",
         "sphere-gpg-keys.i686",
         "sphere-repos-testing.i686",
         "sphere-repos-extra.i686",
-        "sphere-release-identity-cinnamon.i686",
-        "sphere-release-identity-xfce.i686",
-        "sphere-release-identity-kde.i686",
         "sphere-release.i686",
-        "sphere-release-server.i686",
-        "sphere-release-arm.i686",
-        "sphere-release-cinnamon.i686",
-        "sphere-release-kde.i686",
-        "sphere-release-xfce.i686",
+        "sphere-release-certified.i686",
         "sphere-repos-flatpak.i686"
       ],
       "spirv-headers": [
diff --git a/variants-i686.xml b/variants-i686.xml
index 8fca8eb..f2c7e0a 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -61,8 +61,7 @@
       <group default="false">server-product</group>
       <group default="false">smart-card</group>
       <group default="false">smb-server</group>
-      <group default="false">sphere-core-arm</group>
-      <group default="false">sphere-core-server</group>
+      <group default="false">sphere-core-certified</group>
       <group default="false">standard</group>
       <group default="false">system-tools</group>
       <group default="false">texlive</group>
diff --git a/variants.xml b/variants.xml
index f0892cf..afe3946 100644
--- a/variants.xml
+++ b/variants.xml
@@ -60,8 +60,7 @@
       <group default="false">server-product</group>
       <group default="false">smart-card</group>
       <group default="false">smb-server</group>
-      <group default="false">sphere-core-arm</group>
-      <group default="false">sphere-core-server</group>
+      <group default="false">sphere-core-certified</group>
       <group default="false">standard</group>
       <group default="false">system-tools</group>
       <group default="false">texlive</group>