Replace gateway by S3 repository