A solar rooftop Programme by the Energy Commission is to be expanded to cover non-residential facilities including ministries, departments and agencies across the country.