diff --git a/Block/Adminhtml/Form/Field/InstallmentsNumber.php b/Block/Adminhtml/Form/Field/InstallmentsNumber.php
index 9fd93db0..b3b0af10 100644
--- a/Block/Adminhtml/Form/Field/InstallmentsNumber.php
+++ b/Block/Adminhtml/Form/Field/InstallmentsNumber.php
@@ -6,6 +6,7 @@
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Pagarme\Core\Kernel\Services\InstallmentService;
 use Pagarme\Pagarme\Model\Account;
 use Pagarme\Pagarme\Model\PagarmeConfigProvider;
 
@@ -42,12 +43,16 @@ public function render(AbstractElement $element)
         $isGateway = $this->account->isGateway(PagarmeConfigProvider::CREDIT_CARD_PAYMENT_CONFIG);
         if ($isGateway) {
             $classes = $element->getClass();
-            $classes = str_replace('number-range-1-12', '', $classes);
-            $classes .= ' number-range-1-24';
+            $classes = str_replace('number-range-1-' . InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER, '', $classes);
+            $classes .= ' number-range-1-' . InstallmentService::MAX_GATEWAY_INSTALLMENTS_NUMBER;
             $element->setClass($classes);
 
             $comment = $element->getComment();
-            $comment = str_replace('12', '24', $comment);
+            $comment = str_replace(
+                InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER,
+                InstallmentService::MAX_GATEWAY_INSTALLMENTS_NUMBER,
+                $comment
+            );
             $element->setComment($comment);
         }
         return parent::render($element);
diff --git a/Model/PagarmeConfigProvider.php b/Model/PagarmeConfigProvider.php
index 38a4b662..33765730 100644
--- a/Model/PagarmeConfigProvider.php
+++ b/Model/PagarmeConfigProvider.php
@@ -8,6 +8,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Pagarme\Core\Kernel\Services\InstallmentService;
 use Pagarme\Core\Middle\Model\Account\PaymentEnum;
 use Pagarme\Pagarme\Gateway\Transaction\Base\Config\ConfigInterface as PagarmeConfigInterface;
 
@@ -64,7 +65,7 @@ class PagarmeConfigProvider implements ConfigProviderInterface
     const DEBIT_PAYMENT_CONFIG = 'pagarme_debit';
 
     const PIX_PAYMENT_CONFIG = 'pagarme_pix';
-    
+
     const GOOGLEPAY_PAYMENT_CONFIG = 'pagarme_googlepay';
 
     const VOUCHER_PAYMENT_CONFIG = 'pagarme_voucher';
@@ -198,15 +199,14 @@ public function validateMaxInstallment()
     {
         $isGatewayIntegrationType = $this->isGatewayIntegrationType();
         $maxInstallment = $this->getMaxInstallment();
-        $maxInstallmentForPSP = 12;
 
         if (
             !$isGatewayIntegrationType
-            && $maxInstallment > $maxInstallmentForPSP
+            && $maxInstallment > InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER
         ) {
             $this->config->saveConfig(
                 self::XML_PATH_MAX_INSTALLMENT,
-                $maxInstallmentForPSP,
+                InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER,
                 'default',
                 0
             );
diff --git a/etc/adminhtml/system/transaction/creditcard/installments.xml b/etc/adminhtml/system/transaction/creditcard/installments.xml
index b9f4eb4d..68f593e4 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments.xml
@@ -25,9 +25,9 @@
         <field id="installments_number" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_active">1</field>
@@ -84,7 +84,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_active">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/amex.xml b/etc/adminhtml/system/transaction/creditcard/installments/amex.xml
index abc7052d..b1f64a34 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/amex.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/amex.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_amex" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_amex'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_amex'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_amex</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_amex" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_amex</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_amex">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/aura.xml b/etc/adminhtml/system/transaction/creditcard/installments/aura.xml
index 847d49c2..82bd3fe4 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/aura.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/aura.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_aura" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_aura'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_aura'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_aura</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_aura" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_aura</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_aura">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/banese.xml b/etc/adminhtml/system/transaction/creditcard/installments/banese.xml
index b1c320c4..d5ac0228 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/banese.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/banese.xml
@@ -16,9 +16,9 @@
         <field id="installments_number_banese" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and 24.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and 18.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_banese</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_banese" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -59,7 +59,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_banese</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_banese">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/cabal.xml b/etc/adminhtml/system/transaction/creditcard/installments/cabal.xml
index 676baacc..656bfa72 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/cabal.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/cabal.xml
@@ -16,9 +16,9 @@
         <field id="installments_number_cabal" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and 24.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and 18.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_cabal</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_cabal" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -59,7 +59,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_cabal</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_cabal">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/credz.xml b/etc/adminhtml/system/transaction/creditcard/installments/credz.xml
index 2b71bf47..e88dd667 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/credz.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/credz.xml
@@ -16,9 +16,9 @@
         <field id="installments_number_credz" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and 24.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and 18.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_credz</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_credz" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -59,7 +59,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_credz</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_credz">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/diners.xml b/etc/adminhtml/system/transaction/creditcard/installments/diners.xml
index 0484266e..93decf7e 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/diners.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/diners.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_diners" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_diners'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_diners'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_diners</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_diners" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_diners</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_diners">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/discover.xml b/etc/adminhtml/system/transaction/creditcard/installments/discover.xml
index 0354a61b..88fed2ce 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/discover.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/discover.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_discover" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <label>Max number of installments</label>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_discover'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_discover'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_discover</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_discover" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_discover</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_discover">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/elo.xml b/etc/adminhtml/system/transaction/creditcard/installments/elo.xml
index bf419cb6..c21dcbd9 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/elo.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/elo.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_elo" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_elo'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_elo'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_elo</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_elo" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_elo</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_elo">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/hipercard.xml b/etc/adminhtml/system/transaction/creditcard/installments/hipercard.xml
index a1c27f50..0e4f716c 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/hipercard.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/hipercard.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_hipercard" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_hipercard'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_hipercard'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_hipercard</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_hipercard" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_hipercard</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_hipercard">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/jcb.xml b/etc/adminhtml/system/transaction/creditcard/installments/jcb.xml
index c589dc64..dd8d211e 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/jcb.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/jcb.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_jcb" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_jcb'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_jcb'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_jcb</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_jcb" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_jcb</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_jcb">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/mastercard.xml b/etc/adminhtml/system/transaction/creditcard/installments/mastercard.xml
index a341bd90..cceb0974 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/mastercard.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/mastercard.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_mastercard" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_mastercard'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_mastercard'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_mastercard</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_mastercard" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_mastercard</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_mastercard">1</field>
diff --git a/etc/adminhtml/system/transaction/creditcard/installments/visa.xml b/etc/adminhtml/system/transaction/creditcard/installments/visa.xml
index a14a6094..bbb0b892 100644
--- a/etc/adminhtml/system/transaction/creditcard/installments/visa.xml
+++ b/etc/adminhtml/system/transaction/creditcard/installments/visa.xml
@@ -15,9 +15,9 @@
         <field id="installments_number_visa" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
             <label>Max number of installments</label>
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
-            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_visa'>12</span>.</p>]]></comment>
+            <comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_visa'>18</span>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_number_visa</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
         </field>
         <field id="installment_min_amount_visa" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
             <backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
             <comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
             <config_path>payment/pagarme_creditcard/installments_max_without_interest_visa</config_path>
-            <validate>required-entry validate-number-range number-range-1-12</validate>
+            <validate>required-entry validate-number-range number-range-1-18</validate>
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
             <depends>
                 <field id="installments_interest_by_issuer_visa">1</field>
diff --git a/etc/config.xml b/etc/config.xml
index 17494609..8b33cd16 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -58,56 +58,56 @@
                 <sort_order>1</sort_order>
                 <installments_active>0</installments_active>
                 <installments_interest_by_issuer>0</installments_interest_by_issuer>
-                <installments_number>12</installments_number>
+                <installments_number>18</installments_number>
                 <installments_is_with_interest>1</installments_is_with_interest>
                 <installment_min_amount>10.00</installment_min_amount>
                 <installments_interest_rate>10</installments_interest_rate>
                 <installments_max_without_interest>6</installments_max_without_interest>
-                <installments_number_amex>12</installments_number_amex>
+                <installments_number_amex>18</installments_number_amex>
                 <installments_interest_rate_initial_amex>0</installments_interest_rate_initial_amex>
                 <installments_interest_rate_incremental_amex>0</installments_interest_rate_incremental_amex>
                 <installments_max_without_interest_amex>1</installments_max_without_interest_amex>
-                <installments_number_aura>12</installments_number_aura>
+                <installments_number_aura>18</installments_number_aura>
                 <installments_interest_rate_initial_aura>0</installments_interest_rate_initial_aura>
                 <installments_interest_rate_incremental_aura>0</installments_interest_rate_incremental_aura>
                 <installments_max_without_interest_aura>1</installments_max_without_interest_aura>
-                <installments_number_banese>12</installments_number_banese>
+                <installments_number_banese>18</installments_number_banese>
                 <installments_interest_rate_initial_banese>0</installments_interest_rate_initial_banese>
                 <installments_interest_rate_incremental_banese>0</installments_interest_rate_incremental_banese>
                 <installments_max_without_interest_banese>1</installments_max_without_interest_banese>
-                <installments_number_cabal>12</installments_number_cabal>
+                <installments_number_cabal>18</installments_number_cabal>
                 <installments_interest_rate_initial_cabal>0</installments_interest_rate_initial_cabal>
                 <installments_interest_rate_incremental_cabal>0</installments_interest_rate_incremental_cabal>
                 <installments_max_without_interest_cabal>1</installments_max_without_interest_cabal>
-                <installments_number_credz>12</installments_number_credz>
+                <installments_number_credz>18</installments_number_credz>
                 <installments_interest_rate_initial_credz>0</installments_interest_rate_initial_credz>
                 <installments_interest_rate_incremental_credz>0</installments_interest_rate_incremental_credz>
                 <installments_max_without_interest_credz>1</installments_max_without_interest_credz>
-                <installments_number_diners>12</installments_number_diners>
+                <installments_number_diners>18</installments_number_diners>
                 <installments_interest_rate_initial_diners>0</installments_interest_rate_initial_diners>
                 <installments_interest_rate_incremental_diners>0</installments_interest_rate_incremental_diners>
                 <installments_max_without_interest_diners>1</installments_max_without_interest_diners>
-                <installments_number_discover>12</installments_number_discover>
+                <installments_number_discover>18</installments_number_discover>
                 <installments_interest_rate_initial_discover>0</installments_interest_rate_initial_discover>
                 <installments_interest_rate_incremental_discover>0</installments_interest_rate_incremental_discover>
                 <installments_max_without_interest_discover>1</installments_max_without_interest_discover>
-                <installments_number_elo>12</installments_number_elo>
+                <installments_number_elo>18</installments_number_elo>
                 <installments_interest_rate_initial_elo>0</installments_interest_rate_initial_elo>
                 <installments_interest_rate_incremental_elo>0</installments_interest_rate_incremental_elo>
                 <installments_max_without_interest_elo>1</installments_max_without_interest_elo>
-                <installments_number_hipercard>12</installments_number_hipercard>
+                <installments_number_hipercard>18</installments_number_hipercard>
                 <installments_interest_rate_initial_hipercard>0</installments_interest_rate_initial_hipercard>
                 <installments_interest_rate_incremental_hipercard>0</installments_interest_rate_incremental_hipercard>
                 <installments_max_without_interest_hipercard>1</installments_max_without_interest_hipercard>
-                <installments_number_jcb>12</installments_number_jcb>
+                <installments_number_jcb>18</installments_number_jcb>
                 <installments_interest_rate_initial_jcb>0</installments_interest_rate_initial_jcb>
                 <installments_interest_rate_incremental_jcb>0</installments_interest_rate_incremental_jcb>
                 <installments_max_without_interest_jcb>1</installments_max_without_interest_jcb>
-                <installments_number_mastercard>12</installments_number_mastercard>
+                <installments_number_mastercard>18</installments_number_mastercard>
                 <installments_interest_rate_initial_mastercard>0</installments_interest_rate_initial_mastercard>
                 <installments_interest_rate_incremental_mastercard>0</installments_interest_rate_incremental_mastercard>
                 <installments_max_without_interest_mastercard>1</installments_max_without_interest_mastercard>
-                <installments_number_visa>12</installments_number_visa>
+                <installments_number_visa>18</installments_number_visa>
                 <installments_interest_rate_initial_visa>0</installments_interest_rate_initial_visa>
                 <installments_interest_rate_incremental_visa>0</installments_interest_rate_incremental_visa>
                 <installments_max_without_interest_visa>1</installments_max_without_interest_visa>
@@ -135,7 +135,7 @@
                 <sort_order>1</sort_order>
                 <installments_active>0</installments_active>
                 <installments_interest_by_issuer>0</installments_interest_by_issuer>
-                <installments_number>12</installments_number>
+                <installments_number>18</installments_number>
                 <installments_is_with_interest>1</installments_is_with_interest>
                 <installment_min_amount>10.00</installment_min_amount>
                 <installments_interest_rate>10</installments_interest_rate>
@@ -162,7 +162,7 @@
                 <sort_order>1</sort_order>
                 <installments_active>0</installments_active>
                 <installments_interest_by_issuer>0</installments_interest_by_issuer>
-                <installments_number>12</installments_number>
+                <installments_number>18</installments_number>
                 <installments_is_with_interest>1</installments_is_with_interest>
                 <installment_min_amount>10.00</installment_min_amount>
                 <installments_interest_rate>10</installments_interest_rate>
@@ -241,4 +241,4 @@
             </pagarme_googlepay>
         </payment>
     </default>
-</config>
\ No newline at end of file
+</config>
diff --git a/i18n/pt_BR.csv b/i18n/pt_BR.csv
index 30712c96..e6c31532 100644
--- a/i18n/pt_BR.csv
+++ b/i18n/pt_BR.csv
@@ -387,16 +387,16 @@
 "<p id='creditcard_soft_description_comment'>Max size: <span id='soft_description_max_size'></span>.<span id='creditcard_soft_description_counter'><span id='creditcard_soft_description_counter_current'></span> / <span id='creditcard_soft_description_counter_max_size'></span></span></p>", "<p id='creditcard_soft_description_comment'>Tamanho máximo: <span id='soft_description_max_size'></span>.<span id='creditcard_soft_description_counter'><span id='creditcard_soft_description_counter_current'></span> / <span id='creditcard_soft_description_counter_max_size'></span></span></p>"
 "<p id='voucher_soft_description_comment'>Max size: 22.<span id='voucher_soft_description_counter'><span id='voucher_soft_description_counter_current'></span> / 22</span></p>","<p id='voucher_soft_description_comment'>Tamanho máximo: 22.<span id='voucher_soft_description_counter'><span id='voucher_soft_description_counter_current'></span> / 22</span></p>"
 "<p id='debit_soft_description_comment'>Max size: 22.<span id='debit_soft_description_counter'><span id='debit_soft_description_counter_current'></span> / 22</span></p>","<p id='debit_soft_description_comment'>Tamanho máximo: 22.<span id='debit_soft_description_counter'><span id='debit_soft_description_counter_current'></span> / 22</span></p>"
-"<p>Insert a number between 1 and <span id='installments_max_size'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_visa'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_visa'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_mastercard'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_mastercard'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_amex'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_amex'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_hipercard'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_hipercard'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_diners'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_diners'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_elo'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_elo'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_discover'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_discover'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_aura'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_aura'></span>.</p>"
-"<p>Insert a number between 1 and <span id='installments_max_size_jcb'></span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_jcb'></span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_visa'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_visa'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_mastercard'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_mastercard'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_amex'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_amex'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_hipercard'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_hipercard'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_diners'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_diners'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_elo'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_elo'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_discover'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_discover'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_aura'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_aura'>18</span>.</p>"
+"<p>Insert a number between 1 and <span id='installments_max_size_jcb'>18</span>.</p>", "<p>Insira um número entre 1 e <span id='installments_max_size_jcb'>18</span>.</p>"
 "<p>Insert a number between 1 and 24.</p>","<p>Insira um número entre 1 e 24.</p>"
 "<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>","<p>Insira um número entre 1 e o <b>Número máximo de parcelas</b>.</p>"
 "<p><strong style='color:red'>Warning!</strong> Don't forget to add your store's domain on Pagar.me dashboard</p>", "<p><strong style='color:red'>Aviso!</strong> Não se esqueça de adicionar o domínio da sua loja no painel do Pagar.me</p>"
diff --git a/view/adminhtml/web/js/integrationType.js b/view/adminhtml/web/js/integrationType.js
index cd14b146..d3a1c8c2 100644
--- a/view/adminhtml/web/js/integrationType.js
+++ b/view/adminhtml/web/js/integrationType.js
@@ -3,11 +3,15 @@ require([
     "jquery/ui",
 ], function ($) {
     "use strict";
+
+    const maxPspInstallmentsValue = 18,
+          maxGatewayInstallmentsValue = 24;
+
     $(document).ready(function () {
         const integrationTypeElement = $('select[id*="pagarme_pagarme_global_is_gateway_integration_type"]'),
-            softDescriptionElements = $('input[id$="_soft_description"]'),
-            installmentsNumberElements = $('input[id*="pagarme_creditcard_installments"][id*="installments_number"]'),
-            installmentsWithoutInterestElements = $('input[id*="pagarme_creditcard_installments"][id*="max_without_interest"]');
+              softDescriptionElements = $('input[id$="_soft_description"]'),
+              installmentsNumberElements = $('input[id*="pagarme_creditcard_installments"][id*="installments_number"]'),
+              installmentsWithoutInterestElements = $('input[id*="pagarme_creditcard_installments"][id*="max_without_interest"]');
 
         integrationTypeElement.change(function () {
             const integrationType = $(this).val(),
@@ -91,7 +95,7 @@ require([
 
             if (installmentsMaxSizeElements) {
                 installmentsMaxSizeElements.each(function () {
-                    $(this).html(integrationType === '0' ? 12 : 24);
+                    $(this).html(integrationType === '0' ? maxPspInstallmentsValue : maxGatewayInstallmentsValue);
                 });
             }
         }
@@ -127,11 +131,11 @@ require([
 
         function changeInstallmentsValidation(integrationType) {
             if (integrationType === '0') {
-                installmentsNumberElements.toggleClass('number-range-1-24', false);
-                installmentsNumberElements.toggleClass('number-range-1-12', true);
+                installmentsNumberElements.toggleClass('number-range-1-' + maxGatewayInstallmentsValue, false);
+                installmentsNumberElements.toggleClass('number-range-1-' + maxPspInstallmentsValue, true);
             } else {
-                installmentsNumberElements.toggleClass('number-range-1-12', false);
-                installmentsNumberElements.toggleClass('number-range-1-24', true);
+                installmentsNumberElements.toggleClass('number-range-1-' + maxPspInstallmentsValue, false);
+                installmentsNumberElements.toggleClass('number-range-1-' + maxGatewayInstallmentsValue, true);
             }
         }