diff --git a/remaster/mcs/mcs-functions.sh b/remaster/mcs/mcs-functions.sh
index 540ef96..7763efc 100755
--- a/remaster/mcs/mcs-functions.sh
+++ b/remaster/mcs/mcs-functions.sh
@@ -13,11 +13,10 @@ _setup_fds_live() {
 	# setup 389-ds
 	tmp_config_file="$(mktemp)"
 	echo "[General]
-FullMachineName=sabayon
+FullMachineName=localhost.localdomain
 SuiteSpotUserID=dirsrv
 SuiteSpotGroup=dirsrv
 ConfigDirectoryAdminPwd=mcsmanager
-AdminDomain=sabayon
 
 [slapd]
 ServerPort=389
diff --git a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
index a85a199..232b7c9 100755
--- a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
+++ b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
@@ -1,8 +1,14 @@
 #!/bin/sh
 
+env-update
+source /etc/profile
+
 # merge config updates first
 echo -5 | equo conf update
 
+# make sure that sun-jdk is in use
+java-config -S sun-jdk || exit 1
+
 # setup Desktop icons
 rm /etc/skel/Desktop/*.desktop
 cp /usr/share/applications/keyboard.desktop /etc/skel/Desktop/ -p
@@ -20,6 +26,9 @@ rc-update add oemsystem-default default
 
 # setup fqdn
 sed -i 's/sabayon/localhost.localdomain sabayon/g' /etc/hosts
+sed -i 's/sabayon/localhost.localdomain/g' /etc/conf.d/hostname
+# setup fqdn in 389-admin, stop annoying apache crap
+sed -i '/^#ServerName/ s/.*/ServerName localhost.localdomain/g' /etc/dirsrv/admin-serv/httpd.conf || exit 1
 
 # setup MySQL
 # Fixup mysqld permissions, ebuild bug?