diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowInstitution.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowInstitution.java
index bdecec21..e472068e 100644
--- a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowInstitution.java
+++ b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/OnboardingWorkflowInstitution.java
@@ -7,82 +7,71 @@
 import it.pagopa.selfcare.onboarding.common.TokenType;
 import it.pagopa.selfcare.onboarding.config.MailTemplatePathConfig;
 import it.pagopa.selfcare.onboarding.config.MailTemplatePlaceholdersConfig;
-import it.pagopa.selfcare.product.entity.ContractTemplate;
 import it.pagopa.selfcare.product.entity.Product;
-import java.util.Objects;
-import java.util.Optional;
 
 public class OnboardingWorkflowInstitution extends OnboardingWorkflow {
 
-    private String type;
-
-    public OnboardingWorkflowInstitution() {
-    }
-
-    public OnboardingWorkflowInstitution(Onboarding onboarding, String type) {
-        super(onboarding);
-        this.type = type;
-    }
-
-    @Override
-    public String emailRegistrationPath(MailTemplatePathConfig config) {
-        return config.registrationPath();
-    }
-
-    @Override
-    public String getEmailCompletionPath(MailTemplatePathConfig config) {
-        if (InstitutionType.PT.equals(this.onboarding.getInstitution().getInstitutionType())) {
-            return config.completePathPt();
-        } else {
-            return this.onboarding.getProductId().equals(PROD_FD.getValue()) || this.onboarding.getProductId().equals(PROD_FD_GARANTITO.getValue())
-                    ? config.completePathFd()
-                    : config.completePath();
-        }
-    }
-
-    @Override
-    public TokenType getTokenType() {
-        return TokenType.INSTITUTION;
-    }
-
-    @Override
-    public String getPdfFormatFilename() {
-        return PDF_FORMAT_FILENAME;
-    }
-
-    @Override
-    public String getConfirmTokenUrl(MailTemplatePlaceholdersConfig config) {
-        return config.confirmTokenPlaceholder();
-    }
-
-    @Override
-    public String getRejectTokenUrl(MailTemplatePlaceholdersConfig config) {
-        return config.rejectTokenPlaceholder();
-    }
-
-    @Override
-    public String getContractTemplatePath(Product product) {
-        if(Objects.isNull(onboarding.getInstitution()) || Objects.isNull(onboarding.getInstitution().getInstitutionType())){
-            return null;
-        }
-
-        return Optional.ofNullable(product.getInstitutionContractMappings())
-                .filter(mappings -> mappings.containsKey(onboarding.getInstitution().getInstitutionType().name()))
-                .map(mappings -> mappings.get(onboarding.getInstitution().getInstitutionType().name()))
-                .map(ContractTemplate::getContractTemplatePath)
-                .orElse(product.getContractTemplatePath());
-    }
-
-    @Override
-    public String getContractTemplateVersion(Product product) {
-        return product.getContractTemplateVersion();
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
+  private String type;
+
+  public OnboardingWorkflowInstitution() {}
+
+  public OnboardingWorkflowInstitution(Onboarding onboarding, String type) {
+    super(onboarding);
+    this.type = type;
+  }
+
+  @Override
+  public String emailRegistrationPath(MailTemplatePathConfig config) {
+    return config.registrationPath();
+  }
+
+  @Override
+  public String getEmailCompletionPath(MailTemplatePathConfig config) {
+    if (InstitutionType.PT.equals(this.onboarding.getInstitution().getInstitutionType())) {
+      return config.completePathPt();
+    } else {
+      return this.onboarding.getProductId().equals(PROD_FD.getValue())
+              || this.onboarding.getProductId().equals(PROD_FD_GARANTITO.getValue())
+          ? config.completePathFd()
+          : config.completePath();
     }
+  }
+
+  @Override
+  public TokenType getTokenType() {
+    return TokenType.INSTITUTION;
+  }
+
+  @Override
+  public String getPdfFormatFilename() {
+    return PDF_FORMAT_FILENAME;
+  }
+
+  @Override
+  public String getConfirmTokenUrl(MailTemplatePlaceholdersConfig config) {
+    return config.confirmTokenPlaceholder();
+  }
+
+  @Override
+  public String getRejectTokenUrl(MailTemplatePlaceholdersConfig config) {
+    return config.rejectTokenPlaceholder();
+  }
+
+  @Override
+  public String getContractTemplatePath(Product product) {
+    return product.getInstitutionContractTemplate(getIstitutionType()).getContractTemplatePath();
+  }
+
+  @Override
+  public String getContractTemplateVersion(Product product) {
+    return product.getInstitutionContractTemplate(getIstitutionType()).getContractTemplateVersion();
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
 }