Pea, Spinach and Ricotta Cannelloni

I use a dish measuring 32cm x 26cm x 7cm, but I would prefer a deeper dish with the same total volume (e.g. 25cm x 25cm x 9cm). Make the cannelloni about 2cm diameter max, so not too large or there wont be enough pasta or filling to…