diff --git a/jfrog-tasks-utils/utils.js b/jfrog-tasks-utils/utils.js
index 0dd6787a..16ca48b3 100644
--- a/jfrog-tasks-utils/utils.js
+++ b/jfrog-tasks-utils/utils.js
@@ -437,13 +437,7 @@ function configureSpecificCliServer(service, urlFlag, serverId, cliPath, buildDi
     // username and access token params for further use by the users.
     if (oidcProviderName) {
         // we need platform url for oidc token exchange
-        let platformUrl = serviceUrl;
-        if (serviceUrl.endsWith('/xray')) {
-            platformUrl = serviceUrl.replace('/xray', '');
-        }
-        if (serviceUrl.endsWith('/artifactory')) {
-            platformUrl = serviceUrl.replace('/artifactory', '');
-        }
+        let platformUrl = tl.getEndpointAuthorizationParameter(service, 'jfrogPlatformUrl', true);
         serviceAccessToken = exchangeOidcTokenAndSetStepVariables(service, platformUrl, oidcProviderName, cliPath, buildDir);
     }