Interestingly the heat problem for my zbook got solved by reapplying thermal paste just today.