FLUID-5000: Fix to initial starter setup, using improved best practices