Fix the dev template to use two seperate subnets same as prod
Rename postgres job to UAADB.