The Concrete Damage-Plasticity Model II (CDPM2) is one of the built-in models for cementitious materials in LS-DYNA. In the absence of relevant experimental data, its material parameters can be auto-generated in LS-DYNA based on the concrete compressive strength. In the literature, CDPM2 has shown to give good predictive results compared with experimental tests involving complex loading paths and/or multiaxial stress states. However, the recommended parameters are based on the mechanical behavior of normal-strength concrete (NSC). The direct application of CDPM2 with the recommended parameters to ultra-high-performance concrete (UHPC) is thus problematic, as the latter exhibits distinct material properties and mechanical behaviour that diverge significantly from NSC. In this presentation, a systematic modification of CDPM2 is provided, with a focus on yield surfaces, as well as the hardening and softening evolution laws. The modified CDPM2 is shown to achieve good predictive capability, by comparing its simulation results against several experimental data in the literature with complicated stress states, including the eccentric loading of steel encased UHPC specimens.