How to correctly build from Unity Cloud build with AA?

We are currently working on a Unity project (target WebGL) using addressable assets.
AA works well on developer environment, we can build player content (catalog + bundles), upload player content on our server, build player and launch it. The player correctly download bundles and everything works well.

We are not sure how to use Unity Cloud build correctly.
We push on our git all the generated folder /Assets/AddressableAssetsData including /Assets/AddressableAssetsData/WebGL/addressables_content_state.bin
By default, builds for Unity Cloud doesn't contains the famous /StreamingAssets/aa/WebGL/catalog.json so the player fail to load bundles.
If we check the config option "Build Addressables", Unity Cloud create a new catalog.json and add it the build. The issue here is our last catalog online become obsolete, we don't want to update catalog on each new build.
To prevent this problem, we don't use the config option "Build Addressables". We add a post-build script to add /StreamingAssets/aa/WebGL/catalog.json with our current catalog.

I'm sure this is not the best way to use Unity Cloud build with AA Any tip on what to do to ask a build with a specific catalog without create a new one?

Unity version : 2019.4.12.f1
AA version 1.8.5

 

more documentation examples request