Update to work with single self-generated certificate