Layout builder messes up custom post type page template

Hi,

We build a custom post type in a website. This custom post type automatically gets the page template “singe-product.php”. But now we see that when the customer uses the Avia builder in this custom post type, the single-product template is not active.

Best way to explain this problem is to show an example.

Here we did NOT use the Avia builder. In this way we get the right page template (“single-product.php”)

Here we used the Avia builder to add some gallery etc. In this way you see that we don’t get the right page template.

What do we need to add or do to make sure that this custom post type always gets the right page template. With or without the Avia builder used for the page content.

Thanks!