diff --git a/molecules/enlightenment.common b/molecules/enlightenment.common
index 1317447..29eac8b 100644
--- a/molecules/enlightenment.common
+++ b/molecules/enlightenment.common
@@ -50,7 +50,6 @@ packages_to_add:
 	app-crypt/pinentry-gtk2,
 	app-editors/leafpad,
 	app-text/pastebunz,
-	app-misc/calamares-sabayon,
 	dev-libs/fribidi,
 	games-misc/cowsay,
 	gnome-extra/nm-applet-gtk2,
diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common
index a5a2e44..1866d64 100644
--- a/molecules/forensicxfce.common
+++ b/molecules/forensicxfce.common
@@ -85,7 +85,6 @@ packages_to_add:
 	app-crypt/gifshuffle,
 	app-crypt/pdfcrack,
 	app-crypt/WiRouterKeyRec,
-	app-misc/calamares-sabayon,
 	app-misc/screen,
 	app-office/libreoffice,
 	dev-util/geany,
diff --git a/molecules/gnome.common b/molecules/gnome.common
index fa1a20e..0728216 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -70,7 +70,6 @@ packages_to_add:
 	app-dicts/myspell-it,
 	app-dicts/myspell-nl,
 	app-editors/gedit,
-        app-misc/calamares-sabayon,
 	app-misc/gnote,
 	app-misc/sabayon-mce,
 	app-misc/sabayon-steambox,
diff --git a/molecules/kde.common b/molecules/kde.common
index e19d8b9..35b7d99 100644
--- a/molecules/kde.common
+++ b/molecules/kde.common
@@ -67,7 +67,6 @@ packages_to_add:
 	app-dicts/myspell-fr,
 	app-dicts/myspell-it,
 	app-dicts/myspell-nl,
-	app-misc/calamares-sabayon,
 	app-misc/sabayon-mce,
 	app-misc/sabayon-skel,
 	app-misc/sabayon-steambox,
diff --git a/molecules/mate.common b/molecules/mate.common
index 3505088..a399677 100644
--- a/molecules/mate.common
+++ b/molecules/mate.common
@@ -50,7 +50,6 @@ packages_to_add:
 	app-admin/rigo,
 	app-crypt/gnupg,
 	app-crypt/pinentry-gtk2,
-        app-misc/calamares-sabayon,
 	app-text/pastebunz,
 	app-office/libreoffice,
 	app-office/gnumeric,
diff --git a/molecules/minimal.common b/molecules/minimal.common
index 1643a27..06d663a 100644
--- a/molecules/minimal.common
+++ b/molecules/minimal.common
@@ -44,7 +44,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
 packages_to_add:
 	@wireless,
 	@fluxbox,
-        app-misc/calamares-sabayon,
 	app-text/pastebunz,
 	lxde-base/lxdm,
 	media-gfx/feh,
diff --git a/molecules/server.common b/molecules/server.common
index 377a15d..123545d 100644
--- a/molecules/server.common
+++ b/molecules/server.common
@@ -40,9 +40,9 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
 
 packages_to_add:
 	@wireless,
-	app-misc/calamares-sabayon-server,
+	app-admin/anaconda,
 	app-text/pastebunz,
-	 x11-base/xorg-server,
+	x11-base/xorg-server,
 	net-dialup/ppp,
 	net-dialup/rp-pppoe,
 	net-misc/openssh,
diff --git a/molecules/xfce.common b/molecules/xfce.common
index c922714..1d79970 100644
--- a/molecules/xfce.common
+++ b/molecules/xfce.common
@@ -67,7 +67,6 @@ packages_to_add:
 	app-dicts/myspell-fr,
 	app-dicts/myspell-it,
 	app-dicts/myspell-nl,
-        app-misc/calamares-sabayon,
 	app-misc/gnote,
 	app-office/libreoffice,
 	app-text/pastebunz,