diff --git a/kamailio/default.cfg b/kamailio/default.cfg
index 374639d..568e9d8 100644
--- a/kamailio/default.cfg
+++ b/kamailio/default.cfg
@@ -165,8 +165,7 @@ modparam("kazoo", "amqp_max_channels", MY_AMQP_MAX_CHANNELS)
 #!else
 modparam("kazoo", "amqp_max_channels", 100)
 #!endif
-modparam("kazoo", "amqp_internal_loop_count", 1);
-modparam("kazoo", "amqp_consumer_loop_count", 4);
+modparam("kazoo", "amqp_query_timeout_avp", "$avp(kz_timeout)");
 
 ####### Role Configurations ##########
 #!ifdef DISPATCHER-ROLE
diff --git a/kamailio/pusher-role.cfg b/kamailio/pusher-role.cfg
index 32adef2..d2396af 100644
--- a/kamailio/pusher-role.cfg
+++ b/kamailio/pusher-role.cfg
@@ -14,7 +14,7 @@ route[INTERNAL_TO_EXTERNAL_PUSH]
 	       $var(Payload) = '{ "Event-Category" : "notification", "Event-Name" : "push_req",  "Call-ID" : "$ci", "Token-ID" : "$var(TokenID)", "Token-Type" : "$var(TokenType)", "Token-App" : "$var(TokenApp)", "Alert-Body" : "$var(from)" }';        
 	       $var(RoutingKey) = "notification.push." + $var(TokenType) + "." + $var(TokenID);
        	   $var(exchange) = "pushes";
-	       $avp(kazoo=>timeout) = 20000;
+           $avp(kz_timeout) = 20000;
        	   kazoo_query($var(exchange), $var(RoutingKey), $var(Payload));
         }