Fix initial cloudformation templates