Hi @mchau ,
You could try using the decompose
transform. Make sure to look at the examples there in the documentation and test that they work for you before trying to apply this to a different circuit.
There may be more efficient ways of doing this but this one should be easy to implement so that’s a bonus.
I hope this helps!