Fix new ST templates to use the correct PK