diff --git a/distccd/Dockerfile b/distccd/Dockerfile
index 308731e..aa4b74b 100644
--- a/distccd/Dockerfile
+++ b/distccd/Dockerfile
@@ -6,13 +6,6 @@ MAINTAINER mudler <mudler@sabayonlinux.org>
 ENV LC_ALL=en_US.UTF-8
 ENV ACCEPT_LICENSE=*
 
-RUN equo up && equo u && equo i distcc gcc base-gcc
-
-# Cleaning accepted license2s
-RUN rm -rf /etc/entropy/packages/license.accept
-
-RUN echo -5 | equo conf update
-
 # Perform post-upgrade tasks (mirror sorting, updating repository db)
 ADD ./scripts/setup.sh /setup.sh
 RUN /bin/bash /setup.sh  && rm -rf /setup.sh
diff --git a/distccd/scripts/setup.sh b/distccd/scripts/setup.sh
index b34aa3a..789cddd 100755
--- a/distccd/scripts/setup.sh
+++ b/distccd/scripts/setup.sh
@@ -10,8 +10,7 @@ git stash
 git pull
 popd
 
-equo i base-gcc
+equo up && equo u && equo i distcc gcc base-gcc
+echo -5 | equo conf update
 equo cleanup
 sed -i 's/#multifetch = 3/multifetch = 3/' /etc/entropy/client.conf
-
-exit 0