Interesting enough, caffeine was the easiest one. As soon as I started to sleep a good 7 hours a day without exceptions (only occasionally on weekends), caffeine wasn’t that much of a problem. Tea was a substitute for a while, just to tend to the habit of sitting there with a steaming cup ;D
I’m still struggling with alcohol, the last few relapses after long streaks happened early in the morning when I was still drunk. I think this will get better as soon as my discipline overall gets better, which is why I don’t try to focus too much on it. I find it more helpful to direct my energy towards other things that help me build discipline, so the alcohol won’t be a problem in a few weeks. But I also try to find a good amount i can drink without being still drunk after coming home and going to bed (which is a good idea in any way, haha).
I’ll let you know if it works!