iPhone 15 pro max heating issue

I recently upgraded from the iPhone 11 to the iPhone 15 Pro max I have been continuously monitoring the community and have been aware that there are heating issues for this version and I was expecting that the recent update from Apple would fix the issue.but unfortunately the issue still purses and it is very rampantly, heating when charging and also during calls is there going to be any fix that is coming for this or do we have to suffer through this pain?