Remove %suffix if vault isnt used