Tidying up VM configs + emi-ui setup for PP

To be done _after_ DEV is merged into master: #36