diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
index 176726d85..6b6ef2d13 100644
--- a/obp-api/src/main/scala/code/api/util/APIUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -3979,8 +3979,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
           tpp <- BerlinGroupSigning.getTppByCertificate(certificate, cc)
         } yield {
           if (tpp.nonEmpty) {
-            val berlinGroupRole = PemCertificateRole.toBerlinGroup(serviceProvider)
-            val hasRole = tpp.exists(_.services.contains(berlinGroupRole))
+            val hasRole = tpp.exists(_.services.contains(serviceProvider))
             if (hasRole) {
               Full(true)
             } else {
diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
index a0ae6ca04..6de788ee3 100644
--- a/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
+++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
@@ -173,14 +173,6 @@ object PemCertificateRole extends OBPEnumeration[PemCertificateRole] {
   object PSP_IC extends Value
   object PSP_AI extends Value
   object PSP_PI extends Value
-
-  def toBerlinGroup(role: String): String = {
-    role match {
-      case item if PSP_AI.toString == item => "AISP"
-      case item if PSP_PI.toString == item => "PISP"
-      case _ => ""
-    }
-  }
 }
 
 sealed trait UserInvitationPurpose extends EnumValue