[JBTM-1699] more tweaks
[JBTM-1699] have a go at moving credentials to bind step