diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index bea106a..a924904 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -34,7 +34,6 @@ part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
-
 reboot
 
 # Package list.
@@ -44,32 +43,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
+@cloud-server
 
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 5d41dc8..b8315bb 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -44,31 +44,13 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
--dracut-config-rescue
-
-syslinux-extlinux 
+@cloud-server
 
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
+# rescue mode generally isn't useful in the cloud context
+-dracut-config-rescue
 
 # Some things from @core we can do without in a minimal install
 -biosdevname
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index f6a3bee..e181d67 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -35,32 +35,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
+@cloud-server
 
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 25698a5..af66142 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -1,4 +1,4 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
 # Maintained by the Fedora Release Engineering team:
 # https://fedoraproject.org/wiki/ReleaseEngineering
 # mailto:rel-eng@lists.fedoraproject.org
@@ -79,8 +79,8 @@ dracut-*
 # Things needed for installation
 @anaconda-tools
 
-# package cloud base image installs that probably should go in some comps group but what????
-heat-cfntools
+# Packages to enable server images to run in cloud environments
+@cloud-server
 
 # Langpacks
 autocorr-*