diff --git a/config/common.yml b/config/common.yml
index a20659c09..4c0e7630b 100644
--- a/config/common.yml
+++ b/config/common.yml
@@ -189,7 +189,7 @@ services:
       - '@PrestaShop\Module\PrestashopCheckout\ShopContext'
       - '@PrestaShop\Module\PrestashopCheckout\Context\PrestaShopContext'
       - '@ps_checkout.logger'
-      - '@PrestaShop\Module\PrestashopCheckout\Environment\PaypalEnv'
+      - '@PrestaShop\Module\PrestashopCheckout\Environment\Env'
 
   PrestaShop\Module\PrestashopCheckout\Presenter\Store\Modules\PaypalModule:
     class: 'PrestaShop\Module\PrestashopCheckout\Presenter\Store\Modules\PaypalModule'
diff --git a/config/http-clients.yml b/config/http-clients.yml
index 9f81050b4..2ff7954f2 100644
--- a/config/http-clients.yml
+++ b/config/http-clients.yml
@@ -15,7 +15,7 @@ services:
     class: 'PrestaShop\Module\PrestashopCheckout\Builder\Configuration\MaaslandHttpClientConfigurationBuilder'
     public: true
     arguments:
-      - '@PrestaShop\Module\PrestashopCheckout\Environment\PaymentEnv'
+      - '@PrestaShop\Module\PrestashopCheckout\Environment\Env'
       - '@PrestaShop\Module\PrestashopCheckout\Routing\Router'
       - '@PrestaShop\Module\PrestashopCheckout\ShopContext'
       - '@PrestaShop\Module\PrestashopCheckout\Repository\PsAccountRepository'
@@ -38,7 +38,7 @@ services:
     class: 'PrestaShop\Module\PrestashopCheckout\Builder\Configuration\CheckoutClientConfigurationBuilder'
     public: true
     arguments:
-      - '@PrestaShop\Module\PrestashopCheckout\Environment\PaymentEnv'
+      - '@PrestaShop\Module\PrestashopCheckout\Environment\Env'
       - '@PrestaShop\Module\PrestashopCheckout\Routing\Router'
       - '@PrestaShop\Module\PrestashopCheckout\ShopContext'
       - '@PrestaShop\Module\PrestashopCheckout\Repository\PsAccountRepository'