L2SS-790: Removed duplicate steps spread across common base image Closes L2SS-790 See merge request !334