Change test service name
Allow for retaining directories in the retain block of deploy.yml instead of creating a new block