Society, markets, and businesses are changing rapidly and become increasingly complex. To cope with these societal challenges, engineers are needed who can deal with interconnected systems and rapid changes. Experts say that these (future) engineers should be T-shaped professionals. Such professionals will have a broad mastery of general skills atop a few spikes of deep functional or domain expertise. One of the key skills that these professionals should possess is Self-Regulated Learning (SRL). The goal of this education improvement proposal is to improve the SRL skills of students, by developing and implementing an innovative Challenge-Based Learning course and an SRL skill-building line across courses in the 2nd year Master program of CE/CEM/CME at the Faculty of Engineering Technology. This project is funded through WSV (Wet Studie Voorschot).