I wouldn't say I have "stopped", but my productivity has improved greatly after I went through this course: https://www.drdavidmaloney.com/procrastination-course-101
Procrastination is a psychology issue and some of the things that cause it are counter intuitive. This course gave me a toolbox to both recognize and deal with the different causes.