Another attempt at fixing post-deploy for DBs