emcli execute_sql on container databases

Greetings,

We run many emcli processes via native commands like emcli execute_sql and via python modules.

These are used for reporting and password rotation etc.  Most of these processes run against dynamic groups.

Recently we added Container databases with one pluggable database to the group via the dynamic properties criteria.

Our jobs stopped working because  the pluggable database that comes along with the container database is not processed correctly by emcli.

Has anyone found a way to run emcli commands against a container database?

We tried creating a separate non-dynamic group, but we would have to exclude our container databases from the group to get the emcli execute_sql commands