Required forms for non-conforming product and equipment, rework and release programs?

Hi there, I wanted to know if I am on the right path as I am creating and forms for non-conforming product/ equipment, rework & release programs. I am a little confused with what forms or logs I should have to keep things minimal and efficient, here is what I have in mind in creating for those programs:

Hold Tag

Hold Log

Rework (Rework Approval Form & Return to Warehouse Form)

Non-Conformance Log (with corrective action, signature with personnel who placed on hold, final status with either released, received under concession, rejected or dispose) 

CAPA Form

CAPA Log

Release Program

Will these forms be sufficient or is this overkill?

Any feedbacks would be much appreciated. Thank you.

Non-conformance log is too specific, I would make it more general: area of non-conformance, description, root cause, immediate CA, long-term solution, preventive measures, dates/signs, etc.

Non-conformance log is too specific, I would make it more general: area of non-conformance, description, root cause, immediate CA, long-term solution, preventive measures, dates/signs, etc.

Thanks for the feedback! Should I maintain a hold log and make a CAPA log besides the CAPA form as well?

CAPA and hold logs are fine. However, I would try to reduce paperwork as much as possible - so, make sure your forms could be used not only for non-conforming product/equipment but also other aspects & parts of food safety management (e.g. personnel, pest control, ingredients/materials, programs, parameters, etc., etc.)