I've worked in similar shops - I'm a big fan of less pipelines and layers and more environment variables.