yaml fixes for forge