GPII-3248: Update based on feedback from PR
GPII-3248: Update based on feedback from PR

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