Backport 3.1.x [TIMOB-14171] updated a couple more locations where file need a persistent path