clean up patch level handling
make yaml follow the lib template