EBS 12.1 to 12.2 upgrade patch issue

I have hit issue - Worker Fails With ORA-20000: Invalid Application_short_name During 12.2 Upgrade (Doc ID 2204556.1)

so i killed off the main upgrade patch to apply fix 25099342 but cannot seem to get the patch applied, issue is:

applying 12.2 version of patch gives

This patch is not compatible with your current codelines.

This patch is compatible with: entity 'fv' - codeline 'R12.FV.C'.

Your current on-site codeline for the entity 'fv' is: 'R12.FV.B'.

this is because i am upgrading and currently ...

PRODUCT_GROUP_NAME

------------------------------------------------------------

RELEASE_NAME                    M M M

-------------------------------------------------- - - -

Default product group

12.1.3                       Y N N