diff --git a/Dockerfile b/Dockerfile
index 626d7a3..f92dbf2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,13 @@
-FROM sabayon/base-amd64
+FROM sabayon/base-amd64:stage3
 
 # Accepting licenses needed to continue automatic install/upgrade
 ADD ./conf/spinbase-licenses /etc/entropy/packages/license.accept
 
 # Upgrading packages and perform post-upgrade tasks (mirror sorting, updating repository db)
 ADD ./script/post-upgrade.sh /post-upgrade.sh
-RUN equo u &&\
-	echo -5 | equo conf update && \
-	/bin/bash /post-upgrade.sh  && \ 
+
+RUN rsync -av "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/" && ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept && \
+	equo u && \
+	echo -5 | equo conf update 
+RUN /bin/bash /post-upgrade.sh  && \ 
 	rm -rf /post-upgrade.sh
diff --git a/script/post-upgrade.sh b/script/post-upgrade.sh
index 7626990..9795215 100644
--- a/script/post-upgrade.sh
+++ b/script/post-upgrade.sh
@@ -108,9 +108,6 @@ PACKAGES_TO_ADD=(
 equo repo mirrorsort sabayonlinux.org
 equo up
 
-rsync -av -H -A -X --delete-during "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/"
-ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept
-
 #equo i $(cat /etc/sabayon-pkglist | xargs echo)
 equo rm --deep --configfiles --force-system "${PACKAGES_TO_REMOVE[@]}"
 equo i "${PACKAGES_TO_ADD[@]}"