In case of usage of @After* in tests screenshots are not showing the failure

We are automatically taking a screenshot in case of test failure, in docker test or in standard test. However if we use an teardown method (@AfterEach), the screenshot shows what happens on this method, and not what actually fails.
It's less a problem for docker tests since we have the full video, but still could be nice to have the screenshot taken on the failure.