Revert to abstract Container-, ProfileBuilder to align with gravia builders