I am writing an academic paper, and using the term "end user" many times. However, I am confused between "end user" and "end-user". My current policy is to use "end user" if it is used as a noun. For example,
The system is designed for end users.
If it is not used as a noun, I used 'end-user'. For example,
This is an end-user based platform.
It focuses on the end-user networks.
Is this correct hyphen usage? Should I consistently use one form throughout a paper?