S3 Configuration inside Companion
Issue #820 fixed