First shot at merging the yaml files for http > https