[SSHD-358] Builder visibility fixes