diff --git a/Dockerfile b/Dockerfile
index c740034..afa2a9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,15 @@
-FROM plabedan/gentoo
+FROM sabayon/gentoo-stage3-base-amd64
+
+MAINTAINER mudler <mudler@sabayonlinux.org>
 
 # Set locales to en_US.UTF-8
 RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen &&  locale-gen &&  eselect locale set en_US.utf8 && env-update && source /etc/profile
 ENV LC_ALL=en_US.UTF-8
 
-# Upgrading portage
-RUN emerge --sync > /dev/null 2>&1 && layman -a sabayon
+# Upgrading portage and installing necessary packages
+RUN rm -rf '/usr/portage/metadata/timestamp.chk' && \
+	 emerge --sync --quiet && \
+	layman -S && layman -a sabayon
 
 # Configure the sabayon box, installing equo setting up locales
 ADD ./script/sabayon-configuration.sh /
diff --git a/script/post-update.sh b/script/post-update.sh
index fcd310b..f02fde4 100644
--- a/script/post-update.sh
+++ b/script/post-update.sh
@@ -1,6 +1,23 @@
 #!/bin/bash
 
-layman -d plab
+mkdir -p /etc/portage/repos.conf/
+echo "[DEFAULT]
+main-repo = gentoo
+
+[gentoo]
+location = /usr/portage
+sync-type = rsync
+sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage
+" > /etc/portage/repos.conf/gentoo.conf
+
+# Remove compilation tools
+equo rm --nodeps --force-system autoconf automake bison yacc gcc localepurge
+
+# Writing package list file
+equo q list installed -qv > /etc/sabayon-pkglist
+
+equo cleanup
+
 
 # Remove scripts
 rm -rf /equo-rescue-generate.exp
@@ -20,5 +37,8 @@ rm -rf /etc/zsh
 
 rm -rf /post-update.sh
 
-# Writing package list file
-equo q list installed -qv > /etc/sabayon-pkglist
+# cleaning licenses accepted
+rm -rf /etc/entropy/packages/license.accept
+rm -rf /usr/portage/licenses
+
+
diff --git a/script/sabayon-configuration.sh b/script/sabayon-configuration.sh
index 4fbbc16..ea8c3b4 100644
--- a/script/sabayon-configuration.sh
+++ b/script/sabayon-configuration.sh
@@ -14,8 +14,6 @@ mkdir -p /usr/local/portage/profiles/
 echo "masters = gentoo" > /usr/local/portage/metadata/layout.conf
 echo "user_defined" > /usr/local/portage/profiles/repo_name
 
-emerge -C =dev-python/python-exec-0.3.1
-
 mkdir -p /etc/portage/package.keywords/
 echo "app-admin/equo ~amd64
 sys-apps/entropy ~amd64
@@ -28,20 +26,17 @@ sys-apps/file python
 
 
 # emerging equo and expect
-emerge -vt equo --autounmask-write || exit 1
-emerge expect || exit 1
+USE="ncurses" emerge -j -vt equo --autounmask-write || exit 1
+emerge -j expect || exit 1
 
-# Choosing only python2.7 for now, cleaning others
+# Enforce choosing only python2.7 for now, cleaning others
 eselect python set python2.7
 
-# Removing other versions of python
-emerge -C python:3.2 python:3.3
-
 # Specifying a gentoo profile
 eselect profile set default/linux/amd64/13.0/desktop
 
 # default to opendns for next stage(s)
-echo "nameserver 208.67.222.222" > /etc/resolv.conf
+echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
 # set default shell
 chsh -s /bin/bash