diff --git a/src/DependencyInjection/listeners.xml b/src/DependencyInjection/listeners.xml
index 5a3b3c7b..7a3f69c5 100644
--- a/src/DependencyInjection/listeners.xml
+++ b/src/DependencyInjection/listeners.xml
@@ -36,7 +36,7 @@
         </service>
 
         <service id="PayonePayment\EventListener\StorefrontRenderEventListener">
-            <argument type="service" id="PayonePayment\Components\Helper\ActivePaymentMethodsLoaderInterface"/>
+            <argument key="$activePaymentMethodsLoader" type="service" id="PayonePayment\Components\Helper\ActivePaymentMethodsLoaderInterface"/>
 
             <tag name="kernel.event_subscriber"/>
         </service>
@@ -75,10 +75,10 @@
         </service>
 
         <service id="PayonePayment\EventListener\PayPalV2ExpressEventListener">
-            <argument type="service" id="PayonePayment\Components\Helper\ActivePaymentMethodsLoaderInterface"/>
-            <argument type="service" id="PayonePayment\Components\ConfigReader\ConfigReaderInterface"/>
-            <argument type="service" id="router"/>
-            <argument type="service" id="monolog.logger.payone" />
+            <argument key="$activePaymentMethodsLoader" type="service" id="PayonePayment\Components\Helper\ActivePaymentMethodsLoaderInterface"/>
+            <argument key="$configReader" type="service" id="PayonePayment\Components\ConfigReader\ConfigReaderInterface"/>
+            <argument key="$router" type="service" id="router"/>
+            <argument key="$logger" type="service" id="monolog.logger.payone" />
             <tag name="kernel.event_subscriber"/>
         </service>
 
diff --git a/src/DependencyInjection/services.xml b/src/DependencyInjection/services.xml
index 52779345..52fbb648 100644
--- a/src/DependencyInjection/services.xml
+++ b/src/DependencyInjection/services.xml
@@ -51,9 +51,9 @@
         <service id="PayonePayment\Components\Currency\CurrencyPrecisionInterface" alias="PayonePayment\Components\Currency\CurrencyPrecision"/>
 
         <service id="PayonePayment\Components\Helper\ActivePaymentMethodsLoader">
-            <argument type="service" id="cache.object"/>
-            <argument type="service" id="sales_channel.payment_method.repository"/>
-            <argument type="service" id="sales_channel.repository" />
+            <argument key="$cachePool" type="service" id="cache.object"/>
+            <argument key="$paymentMethodRepository" type="service" id="sales_channel.payment_method.repository"/>
+            <argument key="$salesChannelRepository" type="service" id="sales_channel.repository" />
         </service>
         <service id="PayonePayment\Components\Helper\ActivePaymentMethodsLoaderInterface" alias="PayonePayment\Components\Helper\ActivePaymentMethodsLoader"/>