Sorry, I am not using CloudFormation. But that would be a great idea. I made a few changes last week. Right now my setup is like this: