Update Raspberry Pi (3/4) templates to match meta-raspberrypi configuration