Tips to extend battery life on Windows 10/11

Am going to have to return to the office soon, will take the train (e.g., 2 hours each way). For some reason, am only getting about 3 to 3.5 hours of battery life on my framework laptop running Windows 10. Any tips to increase the battery life would be appreciated. Maybe updating the firmware or buying a replacement battery will work?

I have the i5-1240P with 64 GB of RAM and a 2TB SSD.

Also, do you think upgrading to Windows 11 will help a lot with the battery?

have you tried the solutions listed here?