Update blueprint buildout with latest best practice