Rajamangala University of Technology Thanyaburi (RMUTT), Thailand has adopted a thematic approach to Advancing CDIO Curriculum Development comprising Mapping – Enhancing – Innovating – Sustaining in collaboration with Singapore Polytechnic, Singapore. This paper focuses on mapping and enhancing approaches to curriculum design and development first to occur. In 2018, RMUTT launched a policy at the institutional level for curriculum development for a total of 34 programs comprising 6 engineering and 28 non-engineering programmes. CDIO workshop was conducted for 200 program committees from 7 faculties to prepare them for reimagining the curriculum redesign. For the mapping approach, a trend analysis was conducted to identify future-ready competencies and future graduate attributes and correspondingly develop relevant programme outcomes. For the enhancing approach, two new mandatory courses, namely, Introduction to the Profession and Multi-disciplinary Project (MDP) courses, were introduced. These two courses were developed in accordance with CDIO standards 4 and 5 by offering a design-build-test learning experience to the students. Other CDIO skillsets such as professional competencies, personal and interpersonal skills are integrated into the program systematically. This paper aims to share similarities and differences of graduate attributes and program outcomes between engineering and non-engineering focus in the Thai industry context. The implementation of mapping and enhancing approaches will also be discussed.