diff --git a/Dockerfile b/Dockerfile
index cad01b8..70c10c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,7 @@ RUN locale-gen || true
 
 # Upgrading portage and installing necessary packages
 RUN rm -rf '/usr/portage/metadata/timestamp.chk' && \
-	 emerge-webrsync && \
-	layman -S && echo "y" | layman -a sabayon
-
+	 emerge-webrsync
 # Configure the sabayon box, installing equo setting up locales
 ADD ./script/sabayon-configuration.sh /
 RUN /bin/bash /sabayon-configuration.sh && rm -rf /sabayon-configuration.sh
diff --git a/script/sabayon-configuration.sh b/script/sabayon-configuration.sh
index a4eed50..22dbad3 100644
--- a/script/sabayon-configuration.sh
+++ b/script/sabayon-configuration.sh
@@ -24,7 +24,9 @@ echo "dev-lang/python sqlite
 sys-apps/file python
 " > /etc/portage/package.use/00-sabayon.package.use
 
+emerge layman
 
+layman -S && echo "y" | layman -a sabayon
 echo "y" | layman -a sabayon-distro
 
 sed -i 's/repos\.conf/make.conf/' /etc/layman/layman.cfg
@@ -45,7 +47,7 @@ USE="ncurses" emerge -j -vt equo app-admin/localepurge --autounmask-write || exi
 emerge -j expect || exit 1
 
 # Enforce choosing only python2.7 for now, cleaning others
-eselect python set python2.7
+eselect python set python3.6
 
 # default for next stage(s)
 echo "nameserver 8.8.8.8" > /etc/resolv.conf