M18 service and CICD updates

Madalyn Marabellarequested to merge
aws-infra-merge into master

AWS code changes only

Merge request template

Edited by Madalyn Marabella

Merge request reports