diff --git a/Dockerfile b/Dockerfile
index 3c3fd46..0f4bd50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,15 @@ MAINTAINER mudler <mudler@sabayonlinux.org>
 
 # Set locales to en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
-# Accept all licenses
-ENV ACCEPT_LICENSE=*
+
+# 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 up && equo u && \
+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 up && equo u && \
 	echo -5 | equo conf update
 
 RUN /bin/bash /post-upgrade.sh  && \