diff --git a/Dockerfile b/Dockerfile
index 1c60d4b..cad01b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM sabayon/gentoo-stage3-base-amd64
+FROM sabayon/gentoo-stage3-base-amd64:latest
 
 MAINTAINER mudler <mudler@sabayonlinux.org>
 
@@ -11,7 +11,7 @@ RUN locale-gen || true
 # Upgrading portage and installing necessary packages
 RUN rm -rf '/usr/portage/metadata/timestamp.chk' && \
 	 emerge-webrsync && \
-	layman -S && layman -a sabayon
+	layman -S && echo "y" | layman -a sabayon
 
 # Configure the sabayon box, installing equo setting up locales
 ADD ./script/sabayon-configuration.sh /
diff --git a/script/sabayon-configuration.sh b/script/sabayon-configuration.sh
index 98ccad6..52065f9 100644
--- a/script/sabayon-configuration.sh
+++ b/script/sabayon-configuration.sh
@@ -24,8 +24,13 @@ echo "dev-lang/python sqlite
 sys-apps/file python
 " > /etc/portage/package.use/00-sabayon.package.use
 
+
 echo "y" | layman -a sabayon-distro
 
+echo "conf_type : make.conf" >>  /etc/layman/layman.cfg
+
+layman-updater -R
+
 echo "source /var/lib/layman/make.conf" >> /etc/portage/make.conf
 
 eselect profile set default/linux/amd64/13.0
@@ -37,7 +42,7 @@ gcc-config 1
 . /etc/profile
 
 # emerging equo and expect
-USE="ncurses" emerge -j -vt equo --autounmask-write || exit 1
+USE="ncurses" emerge -j -vt equo app-admin/localepurge --autounmask-write || exit 1
 emerge -j expect || exit 1
 
 # Enforce choosing only python2.7 for now, cleaning others