Revert "Remove unicorn changes"

This reverts commit ee3e4db65cff0d1e01e87096bad77aabbc587450.
Re-add default AWS templates