SWITCHYARD-1772 - Security changes for implementation