Revert "Revert "GPO restrict app ts""

This reverts commit 994ebadd69dfdc562cc97ed395ff096f7a4d1bfd.