To prepare a gluten-free version of this dish, substitute the pasta with your preferred gluten-free short pasta made from rice, lentil, or corn flour. Cook it 1–2 minutes less than the package instructions, as gluten-free varieties tend to soften more quickly during baking. Ensure that the marinara sauce and cheeses used are certified gluten-free to avoid cross-contamination.