Webdispatcher and ABAP backend as two distinct Service Providers ?

Hello,

We have two distinct business scenarios :

Fiori : End Users Access to the SAP Netweaver Gateway 7.4 through its HTTPS URL : https://srv-sap-gwpa.domain:44320/

HR Renewal : End Users Access to the SAP Netweaver Gateway 7.4 through the SAP WebDispatcher : https://srv-sap-wdsp.domain:44320

Both scenarios work fine ...

We had a request to configure SAML 2.0 for both scenarios, ADFS being the Identity Provider.

I believe that a Service Provider is called here a "Relying Party".

When configuring separately, Fiori OR HR Renewal, it works fine, users are authenticated into ADFS and their redirected to Fiori (Netweaver GAteway URL) or HR Renewal (SAP WebDispathcer).

The Problem is that we obviously need to configure both scenarios together, and here it  does not work as expected, Fiori Users are bot redircted after authentication to the NEtweaver GAteway but are redirected to the Webdispatcher ... which is blocking for us

For Each scneario Webdispatcher (HR Renewal) and Netweaver Gateway (HR Renewal) we have a distincts Assertion Consumer Service (ACS) URL in ADFS :

We are really not familiar with ADFS, but there might be some trick, somehow , somewhere, to indicate to ADFS to redirect the URLs to the correct Service Provider/Relying Party.

Any help , hint would be appreciated

ADFS Settings For WebDispatcher :

For Netweaver Gateway :

Thanks