Add more configs, and rename cert files to 4096
Add 2048-bit keystores