The non-linear MHD code JOREK features a number of advanced models for disruptions that allow us to capture different phenomena. Among other things this includes the ability to simulate shattered pellet injections (SPI), impurities, neutrals, and the use of free boundary conditions by coupling to resistive walls. In addition, it is possible to model runaway electrons (REs) using either a fluid description which has been coupled to the bulk MHD equations and includes both primary and secondary generation, or kinetically using particle markers to resolve the full phase-space dynamics. In this contribution, we present on one hand results from test particle modeling of RE loads in the ITER tokamak, obtained by post-processing 3D RE fluid simulations of RE beam termination (see the contribution by V.K. Bandaru et al). On the other hand, we describe the recently started project of coupling the kinetic RE model to the MHD background using a particle-in-cell approach, aiming at a self-consistent 3D hybrid model.