Use base64 encoded secrets which Fixes #4158