We did a major review of the PM instructions in our PM task list and included the results of the risk analysis as operations/suboperations (PM instructions) of the PM task list. For example if to perform the PM task specific personal protection equipment is required a operation at the PM Order instructs the mechanic to put on the PPE.
All of my PM's (long text) have "Standard Instructions". These standard instructions are the same on all PM's and lay out basic safety rules in our facility. My PM's also include "special Instructions" which is the actual work/job to be performed. If there are any specific safety requirements that need to be addressed here is where I do it. They are actually part of the "Instructions" i.e. "1.2 Lock out panel ACC-2" or are noted, "use caution when climbing up ladder to clarifier".