Address issues from PR comments
Address issues from PR comments

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