1. Short title This Act may be cited as the Certified Community Behavioral Health Clinic Expansion Act of 2024 . 2. Clarifying psychiatric rehabilitation services under demonstration programs to improve community mental health services (a) Psychosocial rehabilitation services (1) Care coordination Section 223(a)(2)(C) of the Protecting Access to Medicare Act of 2014 ( 42 U.S.C. 1396a note) is amended— (A) in the matter preceding clause (i), by inserting psychosocial, after chronic, ; (B) by redesignating clauses (iv) and (v) as clauses (v) and (vi), respectively; (C) by inserting after clause (iii) the following: (iv) Clubhouses located within the same metropolitan statistical area as the certified community behavioral health clinic, if any such clubhouses exist. ; and (D) by adding at the end the following: (vii) Housing and residential programs. . (2) Scope of services for certification Section 223(a)(2)(D) of the Protecting Access to Medicare Act of 2014 ( 42 U.S.C. 1396a note) is amended— (A) by amending clause (iii) to read as follows: (iii) Patient-centered treatment planning or similar processes, including— (I) risk assessment and crisis planning; (II) programs that are respectful of the person’s autonomy to choose the services they prefer and are provided equitably; and (III) equity-based and noncompulsory programmatic practices in which persons are invited to support each other and participate in decision-making around community activities and services. ; (B) by redesignating clause (viii) as clause (ix); and (C) by striking clause (vii) and inserting the following: (vii) Supporting self-management, including in— (I) managing the person’s finances, medications, and self-care; and (II) using community resources. (viii) Psychiatric rehabilitation services, and psychosocial rehabilitation services, that— (I) restore, rehabilitate, and support daily functioning, skills development, self-esteem, and agency to improve self-management of the negative effects of psychiatric and emotional symptoms