Upgrade to use the standard custom_pom addon