Set correct bucket_id