Project Template not copying geodatabase/toolbox to new projects

[SuzyFer]

I am running on the latest ArcGIS Pro (3.1.1) and am having some trouble with project template contents being copied into new projects.
In my project template I have a geodatabase with feature classes as well as a toolbox with custom tools to fit that project. When I use this template to create a new project, the geodatabase shows up in the geodatabases list in catalog but with a data source to the original master copy of the project template. The toolbox also does not get copied into new projects either. Instead I get blank default gdb and atbx for new projects. What I want is for a template geodatabase to be copied into a new project along with a copy of the toolbox, without having to copy the geodatabase from the master folder and then relink data sources. 

I have gone through all the settings in the Options and for the life of me cannot figure out how to do this. This works perfectly fine on a different Pro project template and the settings are the same. Maybe it's just one of those freaky things that Pro does.. and I need to try to start from scratch.. sigh.

[AndyDixon]

I don't feel like this has been resolved, or at least in the same way that it used to work. I have just gone to republish some templates to our new Enterprise environment using 3.5.2 and I am seeing the same empty default toolbox issues. However, in the folders there is a folder named the same as the template and inside there is the toolbox with all the tools inside.

This is not helpful, in previous versions of the templates that toolbox would be set as the project default filled with the tools, why has this changed?