Address issues described in GPII-3488
Address issues described in GPII-3488

mrtyler/gpii-infra,mrtyler/gpii-terraform,mrtyler/gpii-infra,mrtyler/gpii-terraform,mrtyler/gpii-terraform,mrtyler/gpii-infra,mrtyler/gpii-infra