diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 3ffefc2..f2e2876 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -76,7 +76,7 @@ dracut-*
 @rubyonrails
 @mysql
 @sql-server
-@jbossas
+@javaenterprise
 
 # Things needed for installation
 @anaconda-tools
diff --git a/fedora-install-server.ks b/fedora-install-server.ks
index 868d64d..ab20dd9 100644
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -80,7 +80,6 @@ dracut-*
 
 # Web Server environment
 @haproxy
-@jbossas
 @mongodb
 @perl-web
 @python-web
@@ -100,13 +99,9 @@ dracut-*
 @load-balancer
 @ha
 
-# Packages that we need to add somewhere in comps (FIXME)
-docker-io
-cockpit
-openlmi
-# Missing: rolekit, roles
-# Should be part of @jbossas
-wildfly
+@container-management
+@headless-management
+@javaenterprise
 
 # Things needed for installation
 @anaconda-tools
diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks
index 704654a..687b7d8 100644
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -124,7 +124,7 @@ dracut-*
 @sql-server
 @design-suite
 ## Not included yet due to space concerns
-#@jbossas
+#@javaenterprise
 #@milkymist
 #@mingw32
 #@ocaml