diff --git a/Makefile b/Makefile
index 22a015f..e852c55 100644
--- a/Makefile
+++ b/Makefile
@@ -178,14 +178,14 @@ endif
 $(SYSTOOLS): $(PREPROOT) $(COMPILE_OPTIONS)
 	@scripts/echo Installing standard system tools
 	-$(inroot) $(EMERGE) --unmerge sys-fs/udev
-	$(inroot) $(EMERGE) $(USEPKG) -n1 sys-apps/systemd
+	$(inroot) $(EMERGE) $(USEPKG) --noreplace --oneshot sys-apps/systemd
 	$(inroot) systemd-firstboot \
 		--timezone=$(TIMEZONE) \
 		--hostname=$(HOSTNAME) \
 		--root-password=
 ifeq ($(DASH),YES)
 	if ! test -e "$(STAGE4_TARBALL)";  \
-	then $(inroot) $(EMERGE) -n $(USEPKG) app-shells/dash; \
+	then $(inroot) $(EMERGE) --noreplace $(USEPKG) app-shells/dash; \
 	echo /bin/dash >> $(CHROOT)/etc/shells; \
 	$(inroot) chsh -s /bin/sh root; \
 	fi
@@ -238,7 +238,7 @@ ifeq ($(ENABLE_SSHD),YES)
 endif
 	$(change_password)
 ifeq ($(DASH),YES)
-	$(inroot) $(EMERGE) -c app-shells/bash
+	$(inroot) $(EMERGE) --depclean app-shells/bash
 endif
 ifneq ($(PKGLIST),0)
 	echo \# > $(LST_FILE)
@@ -313,7 +313,7 @@ stage4: $(STAGE4_TARBALL)
 
 
 eclean: $(COMPILE_OPTIONS)
-	$(inroot) $(EMERGE) $(USEPKG) -1 --noreplace app-portage/gentoolkit
+	$(inroot) $(EMERGE) $(USEPKG) --oneshot --noreplace app-portage/gentoolkit
 	$(inroot) eclean-pkg
 	$(inroot) eclean-dist
 	$(inroot) $(EMERGE) --depclean app-portage/gentoolkit
diff --git a/appliances/airport/Makefile b/appliances/airport/Makefile
index ae7206e..daf9d57 100644
--- a/appliances/airport/Makefile
+++ b/appliances/airport/Makefile
@@ -14,7 +14,7 @@ postinstall: airport.service settings.py local.start local.stop issue nginx.conf
 	rm -rf $(CHROOT)/var/lib/postgresql/$(PGVER)
 	$(inroot) bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)"
 	$(inroot) systemctl enable postgresql-$(PGVER)
-	$(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv
+	$(inroot) $(EMERGE) --oneshot --noreplace $(USEPKG) dev-python/virtualenv
 	rm -rf $(CHROOT)/$(APP_ROOT)
 	hg clone -u $(AIRPORT_BRANCH) $(AIRPORT_REPO) $(CHROOT)/$(APP_ROOT)
 	chroot $(CHROOT) virtualenv -p /usr/bin/python3 $(APP_ROOT)
@@ -41,7 +41,7 @@ endif
 	$(inroot) gpasswd -a nginx airport
 	$(inroot) systemctl enable nginx
 ifeq ($(AVAHI),YES)
-	$(inroot) $(EMERGE) -n $(USEPKG) net-dns/avahi
+	$(inroot) $(EMERGE) --noreplace $(USEPKG) net-dns/avahi
 	$(inroot) rm -f /etc/avahi/services/*
 	cp airport.service $(CHROOT)/etc/avahi/services
 	$(inroot) systemctl enable avahi-daemon
diff --git a/appliances/dpaste/Makefile b/appliances/dpaste/Makefile
index 868fdd0..d48f4a5 100644
--- a/appliances/dpaste/Makefile
+++ b/appliances/dpaste/Makefile
@@ -9,14 +9,14 @@ rcdefault := /etc/runlevels/default
 preinstall:
 
 postinstall: bash_profile nginx.conf dpaste.init settings.py firstboot.start
-	$(inroot) $(EMERGE) $(USEPKG) -1n dev-vcs/git
-	$(inroot) $(EMERGE) -n $(USEPKG) dev-db/postgresql:$(PGVER)
+	$(inroot) $(EMERGE) $(USEPKG) --oneshot --noreplace dev-vcs/git
+	$(inroot) $(EMERGE) --noreplace $(USEPKG) dev-db/postgresql:$(PGVER)
 	$(inroot) passwd -d postgres
 	$(inroot) eselect postgresql set $(PGVER)
 	$(inroot) rm -rf /var/lib/postgresql/$(PGVER)/data
 	$(inroot) bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)"
 	$(inroot) systemctl enable postgresql-$(PGVER)
-	$(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv
+	$(inroot) $(EMERGE) --oneshot --noreplace $(USEPKG) dev-python/virtualenv
 	$(inroot) getent passwd $(DPASTE_USER) || \
 		$(inroot) useradd -c "Dpaste Server" -G postgres -U -d $(DPASTE_HOME) $(DPASTE_USER)
 	rm -rf $(CHROOT)/$(DPASTE_HOME)
diff --git a/appliances/teamplayer/Makefile b/appliances/teamplayer/Makefile
index 5fd828f..205f340 100644
--- a/appliances/teamplayer/Makefile
+++ b/appliances/teamplayer/Makefile
@@ -18,7 +18,7 @@ post_files += local.start local.stop issue nginx.conf teamplayer.service
 preinstall:
 
 postinstall: $(post_files) $(SCROBBLER_AUTH) urls.py
-	$(inroot) $(EMERGE) -n $(USEPKG) dev-db/postgresql:$(PGVER)
+	$(inroot) $(EMERGE) --noreplace $(USEPKG) dev-db/postgresql:$(PGVER)
 	$(inroot) passwd -d postgres
 	echo 'PG_INITDB_OPTS="--locale=en_US.UTF-8"' >> $(CHROOT)/etc/conf.d/postgresql-$(PGVER)
 	$(inroot) eselect postgresql set $(PGVER)
@@ -26,12 +26,12 @@ postinstall: $(post_files) $(SCROBBLER_AUTH) urls.py
 	$(inroot) bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)"
 	$(inroot) systemctl enable postgresql-$(PGVER).service
 ifeq ($(AVAHI),YES)
-	$(inroot) $(EMERGE) -n $(USEPKG) net-dns/avahi
+	$(inroot) $(EMERGE) --noreplace $(USEPKG) net-dns/avahi
 	$(inroot) rm -f /etc/avahi/services/*
 	cp teamplayer.service $(CHROOT)/etc/avahi/services
 	$(inroot) systemctl enable avahi-daemon.service
 endif
-	$(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv dev-vcs/mercurial
+	$(inroot) $(EMERGE) --oneshot --noreplace $(USEPKG) dev-python/virtualenv dev-vcs/mercurial
 	$(inroot) getent passwd $(TP_USER) || \
 		$(inroot) useradd -c "Teamplayer Server" -G postgres -U -d $(TP_HOME) $(TP_USER)
 	rm -rf $(CHROOT)/$(TP_HOME)