diff --git a/fedora.conf b/fedora.conf
index e6a90a1..ca6b41b 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -106,7 +106,7 @@ lorax_options = [
 
 # fomat: [(variant_uid_regex, {arch|*: [packages]})]
 additional_packages = [
-    ('^(Workstation|Server|Cloud|Everything)$', {
+    ('^(Workstation|Server|Everything)$', {
         '*': [
             'kernel*',
             'dracut*',
@@ -140,12 +140,6 @@ additional_packages = [
         ],
     }),
 
-    ('^Cloud$', {
-        '*': [
-
-        ],
-    }),
-
 ]
 
 multilib = [
@@ -155,7 +149,7 @@ multilib = [
 ]
 
 filter_packages = [
-    ('(Workstation|Server|Cloud)$', {
+    ('(Workstation|Server)$', {
         '*': [
         'kernel*debug*',
         'kernel-kdump*',
@@ -207,11 +201,6 @@ createiso_skip = [
             'src': True
         }),
 
-        ('^Cloud$', {
-            '*': True,
-            'src': True
-        }),
-
         ('^Everything$', {
             '*': True,
             'src': True
@@ -226,7 +215,7 @@ createiso_skip = [
 
 # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
 #extra_files = [
-#    ('^(Server|Workstation|Cloud)$', {
+#    ('^(Server|Workstation)$', {
 #        '*': [
 #            {
 #                'scm': 'rpm',
@@ -341,7 +330,7 @@ image_build = {
             },
         }
         ],
-    '^CloudImages$': [
+    '^Cloud$': [
         {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
@@ -350,8 +339,8 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 4,
                     'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
-                    'repo': 'Cloud',
-                    'install_tree_from': 'Cloud',
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
                     'subvariant': 'Cloud_Base',
                     'failable': ['ppc64', 'ppc64le', 's390x'],
                      }
@@ -364,8 +353,8 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo': 'Cloud',
-                    'install_tree_from': 'Cloud',
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
                     'subvariant': 'Cloud_Base',
                     'failable': ['*'],
             },
@@ -380,7 +369,7 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 6,
                     'arches': ['aarch64', 'ppc64le', 'x86_64'],
-                    'install_tree_from': 'Cloud',
+                    'install_tree_from': 'Everything',
                     'subvariant': 'AtomicHost',
                     'failable': ['*'],
                      }
@@ -393,7 +382,7 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'install_tree_from': 'Cloud',
+                    'install_tree_from': 'Everything',
                     'subvariant': 'AtomicHost',
                     'failable': ['*'],
                      },
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 760a95f..afc83d9 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -8,10 +8,9 @@
             <arch>ppc64le</arch>
         </arches>
     </variant>
-    <variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">
+    <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
-            <arch>i386</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
@@ -134,43 +133,6 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
-    <variant name="Cloud" id="Cloud" type="variant">
-        <arches>
-            <arch>aarch64</arch>
-            <arch>ppc64</arch>
-            <arch>ppc64le</arch>
-            <arch>s390x</arch>
-            <arch>x86_64</arch>
-        </arches>
-        <groups>
-            <group default="true">cloud-server</group>
-            <group default="true">core</group>
-            <group default="true">standard</group>
-            <group default="true">headless-management</group>
-            <group default="true">dogtag</group>
-            <group default="true">directory-server</group>
-            <group default="true">dns-server</group>
-            <group default="true">freeipa-server</group>
-            <group default="true">ftp-server</group>
-            <group default="true">guest-agents</group>
-            <group default="true">ha</group>
-            <group default="true">load-balancer</group>
-            <group default="true">mail-server</group>
-            <group default="true">mysql</group>
-            <group default="true">network-server</group>
-            <group default="true">smb-server</group>
-            <group default="true">sql-server</group>
-            <group default="true">web-server</group>
-            <!-- Things needed for installation -->
-            <group default="true">anaconda-tools</group>
-            <group default="true">platform-vmware</group>
-            <!-- Things needed for Atomic Host -->
-            <group default="true">ostree-support</group>
-        </groups>
-        <environments>
-          <environment display_order="10">cloud-server-environment</environment>
-        </environments>
-    </variant>
     <variant id="Modular" name="Modular" type="variant">
         <arches>
             <arch>armhfp</arch>