diff --git a/.buildpacks b/.buildpacks
index 29350d4c186..27bed45d8a6 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,3 +1,3 @@
-https://github.com/pkgr/pkgr-buildpack-imagemagick.git
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/pkgr/heroku-buildpack-ruby.git#v183-1
+https://github.com/istrategylabs/heroku-buildpack-node-cleanup
diff --git a/.pkgr.yml b/.pkgr.yml
index cb90f20450d..d3f7b2320d0 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -29,7 +29,7 @@ services:
 installer: https://github.com/pkgr/installer.git
 wizards:
   - https://github.com/pkgr/addon-legacy-installer.git
-  - https://github.com/pkgr/addon-mysql.git
+  - https://github.com/pkgr/addon-postgres
   - https://github.com/pkgr/addon-apache2.git
   - https://github.com/finnlabs/addon-repositories.git
   - https://github.com/pkgr/addon-smtp.git
diff --git a/lib/tasks/packager.rake b/lib/tasks/packager.rake
index edec59503b7..51271cd58bc 100644
--- a/lib/tasks/packager.rake
+++ b/lib/tasks/packager.rake
@@ -47,16 +47,6 @@ namespace :packager do
   # avoids to load the environment multiple times.
   # Removes older assets
   task postinstall: [:environment, 'assets:clean', 'setup:scm'] do
-
-    # We need to precompile assets when either
-    # 1. packager requested it (e.g., due to a server prefix being set)
-    # 2. When a custom Gemfile is added
-    if ENV['REBUILD_ASSETS'] == 'true'
-      Rake::Task['assets:precompile'].invoke
-      FileUtils.chmod_R 'a+rx', "#{ENV['APP_HOME']}/public/assets/"
-      shell_setup(['config:set', 'REBUILD_ASSETS=""'])
-    end
-
     # Clear any caches
     OpenProject::Cache.clear
 
@@ -96,7 +86,6 @@ namespace :packager do
         new_root = relative_root.chomp('/')
 
         shell_setup(['config:set', "RAILS_RELATIVE_URL_ROOT=#{new_root}"])
-        shell_setup(['config:set', 'REBUILD_ASSETS="true"'])
       end
     end