You still plan to lose weight, so yes. I'm not sure actually. Since you've been fasting, maybe just eating maintenance calories would be good for few months so you don't feel like shit when lifting and have some energy. And based on the results, you can either cut to get ideal body weight and then start bulking or increase your physical activity while eating maintenance calories.
Still, I'm not sure about transitioning from fasting to CICO, even though they do the same thing, and lifting weights too. Post calories you ate while fasting and was it something like IF?
Chup chamar! 21% bf falls under avg. Calculate your bf% too from some site and post it.