[TASK] Replace hardcoded storagePid with storagePid from TS