Work ethics in a remote job environment

Hey folks, I'm a Software developer with almost 3 YOE. I joined workforce during the late pandemic period and I've been working remotely for the majority of time. I've developed a bad habit of being unfocused during my work hours and procrastinates my work as far as I can. Sometimes this results in me pulling an allnighter or even finishing the tasks by working in weekends/holidays before the deadline. I aspire to land a high paying remote job within the next 3 years, but I'm pretty sure I won't be able to make it work with my current working habits. How have you managed to be self organised and be focused on your work within the work hours? How can I build good work ethics and how to deal with procrastination?