diff --git a/docs/docs/migration-guides.md b/docs/docs/migration-guides.md
index acdcbee8..ae4b8696 100644
--- a/docs/docs/migration-guides.md
+++ b/docs/docs/migration-guides.md
@@ -16,7 +16,7 @@ sidebar_position: 4
 
 @Bean
 public ConnectionFactoryCustomizer connectionFactoryCustomizer() {
-    return (ConnectionFactoryCustomizer) (asyncProps, connectionFactory) -> {
+    return (connectionFactory, asyncProps) -> {
         connectionFactory.setExceptionHandler(new MyCustomExceptionHandler()); // Optional custom exception handler
         connectionFactory.setCredentialsProvider(new MyCustomCredentialsProvider()); // Optional custom credentials provider
         return connectionFactory;
diff --git a/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md b/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md
index af28a614..201baace 100644
--- a/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md
+++ b/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md
@@ -200,7 +200,7 @@ or automatic recovery strategies:
 
 @Bean
 public ConnectionFactoryCustomizer connectionFactoryCustomizer() {
-    return (ConnectionFactoryCustomizer) (asyncProps, connectionFactory) -> {
+    return (connectionFactory, asyncProps) -> {
         connectionFactory.setExceptionHandler(new MyCustomExceptionHandler()); // Optional custom exception handler
         connectionFactory.setCredentialsProvider(new MyCustomCredentialsProvider()); // Optional custom credentials provider
         return connectionFactory;
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java
index 1ecaf204..80a9fe90 100644
--- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java
@@ -9,6 +9,6 @@
 @FunctionalInterface
 public interface ConnectionFactoryCustomizer {
 
-    ConnectionFactory customize(AsyncProps asyncProps, ConnectionFactory connectionFactory);
+    ConnectionFactory customize(ConnectionFactory connectionFactory, AsyncProps asyncProps);
 
 }
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java
index 923ef2e9..30de2d3d 100644
--- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java
@@ -94,7 +94,7 @@ public static ConnectionFactoryProvider connectionFactoryProvider(AsyncProps asy
                 map.from(rabbitProperties::determineVirtualHost).whenNonNull().to(newFactory::setVirtualHost);
                 newFactory.useNio();
                 setUpSSL(newFactory, rabbitProperties);
-                return cfCustomizer.customize(props, newFactory);
+                return cfCustomizer.customize(newFactory, props);
             } catch (Exception e) {
                 throw new RuntimeException("Error creating ConnectionFactory: ", e);
             }
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java
index 29ca59c1..e096196c 100644
--- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java
@@ -63,7 +63,7 @@ UnroutableMessageProcessor defaultUnroutableMessageProcessor(UnroutableMessageNo
     @Bean
     @ConditionalOnMissingBean(ConnectionFactoryCustomizer.class)
     public ConnectionFactoryCustomizer defaultConnectionFactoryCustomizer() {
-        return ((asyncProps, connectionFactory) -> connectionFactory);
+        return (connectionFactory, asyncProps) -> connectionFactory;
     }
 
 }
diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java
index ff49c4b0..08985347 100644
--- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java
+++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java
@@ -70,8 +70,8 @@ void shouldReturnCreateDiscardProvider() {
 
     @Test
     void shouldReturnBrokerProvider() {
-        when(cfCustomizer.customize(any(AsyncProps.class), any(ConnectionFactory.class)))
-                .thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(1));
+        when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class)))
+                .thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(0));
 
         // Arrange
         AsyncProps props = new AsyncProps();
diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java
index cdfea8ad..52aa0fc5 100644
--- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java
+++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java
@@ -30,8 +30,8 @@ class RabbitMQDiscardProviderImplTest {
 
     @BeforeEach
     void setUp() {
-        when(cfCustomizer.customize(any(AsyncProps.class), any(ConnectionFactory.class)))
-                .thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(1));
+        when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class)))
+                .thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(0));
     }
 
     @Test
diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java
index 32986a06..d95f8583 100644
--- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java
+++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java
@@ -135,7 +135,7 @@ void shouldReturnSameConnectionFactoryWhenCustomizing() {
         ConnectionFactory originalFactory = new ConnectionFactory();
         AsyncProps asyncProps = new AsyncProps();
 
-        ConnectionFactory result = customizer.customize(asyncProps, originalFactory);
+        ConnectionFactory result = customizer.customize(originalFactory, asyncProps);
 
         assertThat(result).isSameAs(originalFactory);
     }