This extended abstract article describes the impact of the COVID 19 health restrictions in the teaching activities at the HEIG-VD university in Switzerland and the way that teaching activities could be maintained by using a custom timetabling algorithm incorporating the necessary social distancing health measures. The modified algorithm, using a mixed-integer program model, produced a new timetable and at the same time automatically selected the optimal mode of delivery for each lecture: remotely by video conference or physically in the classroom. The optimization model ensured that physical contact among students was minimized, while at the same time guaranteed that the courses or laboratories requiring physical presence were still able to take place