diff --git a/Dockerfile b/Dockerfile
index 0f4bd50..5f9611f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,7 @@ 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 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 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
 
 RUN /bin/bash /post-upgrade.sh  && \
 	rm -rf /post-upgrade.sh
diff --git a/script/post-upgrade.sh b/script/post-upgrade.sh
index 88be090..e6ab3c9 100644
--- a/script/post-upgrade.sh
+++ b/script/post-upgrade.sh
@@ -24,7 +24,6 @@ PACKAGES_TO_ADD=(
     "sys-devel/binutils"
     "app-misc/sabayon-version"
     "x11-themes/sabayon-artwork-grub"
-    "app-crypt/gnupg"
     "x11-themes/sabayon-artwork-isolinux"
     "app-crypt/shim-signed"
     "dev-perl/Module-Build"
@@ -44,6 +43,14 @@ mkdir -p /boot/grub
 equo repo mirrorsort sabayonlinux.org
 equo up
 
+equo i app-crypt/gnupg
+equo up
+
+equo i sys-apps/entropy app-admin/equo
+
+equo u
+echo -5 | equo conf update
+
 #equo i $(cat /etc/sabayon-pkglist | xargs echo)
 equo i "${PACKAGES_TO_ADD[@]}"