diff --git a/roles/desktop/files/portage/make.conf b/roles/desktop/files/portage/make.conf
index 9c8821d..56b8249 100644
--- a/roles/desktop/files/portage/make.conf
+++ b/roles/desktop/files/portage/make.conf
@@ -22,10 +22,11 @@ MAKEOPTS="-j8"
 
 # Portage configuration
 ACCEPT_LICENSE="*"
-EMERGE_DEFAULT_OPTS="--jobs 10 --tree --keep-going"
-FEATURES="-network-sandbox"
+EMERGE_DEFAULT_OPTS="-DNUu --backtrack 500 --jobs 10 --keep-going --tree --unordered-display"
+FEATURES="candy cgroup -network-sandbox"
 GENTOO_MIRRORS="http://distfiles.gentoo.org"
 INPUT_DEVICES="libinput"
+PORTAGE_NICENESS="3"
 VIDEO_CARDS="amdgpu i915 intel qxl radeon"
 
 # Package configuration