diff --git a/appliances/teamplayer/Makefile b/appliances/teamplayer/Makefile
index 69c913b..38b0bde 100644
--- a/appliances/teamplayer/Makefile
+++ b/appliances/teamplayer/Makefile
@@ -19,10 +19,9 @@ post_files += issue nginx.conf teamplayer.service
 preinstall:
 
 postinstall: $(post_files) $(SCROBBLER_AUTH) urls.py
-	$(inroot) $(EMERGE) --noreplace $(USEPKG) dev-db/postgresql:$(PGVER)
 	$(inroot) passwd -d postgres
+	$(inroot) eselect postgresql unset
 	$(inroot) eselect postgresql set $(PGVER)
-	$(inroot) rm -rf /var/lib/postgresql/$(PGVER)/data
 	$(inroot) bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)"
 ifeq ($(AVAHI),YES)
 	$(inroot) $(EMERGE) --noreplace $(USEPKG) net-dns/avahi
diff --git a/appliances/teamplayer/world b/appliances/teamplayer/world
index 6d98def..50dab1c 100644
--- a/appliances/teamplayer/world
+++ b/appliances/teamplayer/world
@@ -1,2 +1,3 @@
+dev-db/postgresql:9.6
 media-sound/mpd
 www-servers/nginx