Macro is copying same data into my output files. Issue with Refresh All in for loop

[nalanis]

Hello,

I've been working on this macro for quite some time now and have been unable to find a solution online to my particular problem. Hoping to get some advice or direction on my current code.

I have a macro that does the following:

1. Macro goes through a list of 29 clients from a data validation list.
2. In each instance, a client is selected and a data refresh is executed. I have a direct connect to a SQL server as well as Power Query that produces client information as the desired output.
3. Each individual clients' usage is saved as a single worksheet in a specific folder location with its own unique title.
4. Process continues until my for loop has gone through all of the clients.

My issue has to do with the RefreshAll in my for loop. All of the reports for my clients are saved in the correct folder. However, when I open the excel files it contains all of the usage data from the list client on my data validation list.
I'm not sure if it is a timing issue but when I look at Queries & Connections I see that both my tables are being refreshed but again the data from the last client on my validation list is ending up in all of the reports.

I have unchecked Enable background refresh as well.

I have included my code below:

[nalanis]

Ok, I did some more troubleshooting and it not have to do with the RefreshAll.

I modified the following lines of code

To

This ends up saving the correct data to the correct client. However, it saves the entire workbook and not the Worksheet "Template".