diff --git a/kamailio/default.cfg b/kamailio/default.cfg
index 965f03f..68e372a 100644
--- a/kamailio/default.cfg
+++ b/kamailio/default.cfg
@@ -205,7 +205,9 @@ modparam("kazoo", "amqp_max_channels", MY_AMQP_MAX_CHANNELS)
 modparam("kazoo", "amqp_consumer_processes", MY_AMQP_CONSUMER_PROCESSES)
 modparam("kazoo", "amqp_consumer_workers", MY_AMQP_CONSUMER_WORKERS)
 ## amqp connections
+#!ifdef MY_AMQP_URL
 modparam("kazoo", "amqp_connection", "MY_AMQP_URL")
+#!endif
 #!ifdef MY_AMQP_SECONDARY_URL
 modparam("kazoo", "amqp_connection", "MY_AMQP_SECONDARY_URL")
 #!endif
diff --git a/kamailio/defs-amqp.cfg b/kamailio/defs-amqp.cfg
new file mode 100644
index 0000000..f103111
--- /dev/null
+++ b/kamailio/defs-amqp.cfg
@@ -0,0 +1,86 @@
+## NOTE: DO NOT CHANGE THIS FILE, EDIT local.cfg ##
+
+
+####### amqp defs ########
+#!ifndef AMQP_DEFAULTS_INCLUDED
+#!define AMQP_DEFAULTS_INCLUDED
+
+#!trydef MY_AMQP_MAX_CHANNELS 25
+#!trydef MY_AMQP_CONSUMER_PROCESSES 4
+#!trydef MY_AMQP_CONSUMER_WORKERS 16
+#!trydef MY_AMQP_HEARTBEATS 5
+
+#!ifndef MY_AMQP_ZONE
+#!substdef "!MY_AMQP_ZONE!local!g"
+#!endif
+
+#!ifdef PRESENCE_ROLE
+#!trydef MY_AMQP_PUA_MODE 1
+#!else
+#!trydef MY_AMQP_PUA_MODE 0
+#!endif
+
+#!ifndef MY_AMQP_URL
+#!ifdef AMQP_URL1
+#!substdef "!MY_AMQP_URL!$def(AMQP_URL1)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_SECONDARY_URL
+#!ifdef AMQP_URL2
+#!substdef "!MY_AMQP_SECONDARY_URL!$def(AMQP_URL2)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_TERTIARY_URL
+#!ifdef AMQP_URL3
+#!substdef "!MY_AMQP_TERTIARY_URL!$def(AMQP_URL3)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_QUATERNARY_URL
+#!ifdef AMQP_URL4
+#!substdef "!MY_AMQP_QUATERNARY_URL!$def(AMQP_URL4)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_QUINARY_URL
+#!ifdef AMQP_URL5
+#!substdef "!MY_AMQP_QUINARY_URL!$def(AMQP_URL5)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_SENARY_URL
+#!ifdef AMQP_URL6
+#!substdef "!MY_AMQP_SENARY_URL!$def(AMQP_URL6)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_SEPTENARY_URL
+#!ifdef AMQP_URL7
+#!substdef "!MY_AMQP_SEPTENARY_URL!$def(AMQP_URL7)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_OCTONARY_URL
+#!ifdef AMQP_URL8
+#!substdef "!MY_AMQP_OCTONARY_URL!$def(AMQP_URL8)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_NONARY_URL
+#!ifdef AMQP_URL9
+#!substdef "!MY_AMQP_NONARY_URL!$def(AMQP_URL9)!g"
+#!endif
+#!endif
+
+#!ifndef MY_AMQP_DENARY_URL
+#!ifdef AMQP_URL10
+#!substdef "!MY_AMQP_DENARY_URL!$def(AMQP_URL10)!g"
+#!endif
+#!endif
+
+
+#!endif
+
+# vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab
diff --git a/kamailio/defs.cfg b/kamailio/defs.cfg
index 028800b..1a51094 100644
--- a/kamailio/defs.cfg
+++ b/kamailio/defs.cfg
@@ -44,54 +44,16 @@
 #!substdef "!ANTIFLOOD_CACHE_PERIOD!600!g"
 #!endif
 
-#!trydef MY_AMQP_MAX_CHANNELS 25
-#!trydef MY_AMQP_CONSUMER_PROCESSES 4
-#!trydef MY_AMQP_CONSUMER_WORKERS 16
-#!trydef MY_AMQP_HEARTBEATS 5
-
-#!trydef BLF_USE_SINGLE_DIALOG 1
-
-#!ifndef MY_AMQP_ZONE
-#!substdef "!MY_AMQP_ZONE!local!g"
-#!endif
-
-#!ifdef PRESENCE_ROLE
-#!trydef MY_AMQP_PUA_MODE 1
-#!else
-#!trydef MY_AMQP_PUA_MODE 0
-#!endif
+#!include_file "defs-amqp.cfg"
 
 #!ifndef MEDIA_SERVERS_HASH_SIZE
 #!substdef "!MEDIA_SERVERS_HASH_SIZE!256!g"
 #!endif
 
-#!trydef KZ_PRESENCE_AMQP_PUBLISH 0
-
-#!trydef KZ_PRESENCE_REQUEST_RESUBSCRIBE_PROBE 0
-#!trydef KZ_PRESENCE_REQUEST_PROBE 1
-
 #!trydef RR_FULL_LR 1
 #!trydef RR_DOUBLE_RR 1
 #!trydef RR_FORCE_SOCKET 1
 
-#################################
-## Defs related to SIP_TRACE_ROLE
-##
-#!ifdef SIP_TRACE_ROLE
-
-#!trydef KZ_TRACE 0
-#!trydef KZ_TRACE_INTERNAL 1
-#!trydef KZ_TRACE_EXTERNAL 1
-#!trydef KZ_TRACE_INTERNAL_INCOMING 1
-#!trydef KZ_TRACE_INTERNAL_OUTGOING 1
-#!trydef KZ_TRACE_EXTERNAL_INCOMING 1
-#!trydef KZ_TRACE_EXTERNAL_OUTGOING 1
-#!trydef SIP_TRACE_URI "sip:127.0.0.1:9060"
-#!trydef HEP_CAPTURE_ID 1
-
-
-#!endif
-
 #!ifndef KZ_DISABLE_WEBSOCKETS_REGISTRAR_PORT
 #!trydef KZ_WEBSOCKETS_REGISTRAR_PORT 7000
 #!endif
@@ -102,16 +64,6 @@
 
 #!trydef KZ_MULTI_HOMED 0
 
-#!ifndef KZ_DISABLE_WEBSOCKETS_REGISTRAR_PORT
-#!trydef KZ_WEBSOCKETS_REGISTRAR_PORT 7000
-#!endif
-
-#!ifndef KZ_DISABLE_TLS_REGISTRAR_PORT
-#!trydef KZ_TLS_REGISTRAR_PORT 7000
-#!endif
-
-#!trydef KZ_PRESENCE_FAST_PICKUP_COOKIES 1
-#!trydef KZ_PRESENCE_FAST_PICKUP_REALTIME 1
 
 #!endif
 
diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg
index 0987747..3fbdc83 100644
--- a/kamailio/presence-role.cfg
+++ b/kamailio/presence-role.cfg
@@ -9,6 +9,13 @@
 
 #!trydef KZ_PRESENCE_MAX_CALL_PER_PRESENTITY 20
 
+#!trydef BLF_USE_SINGLE_DIALOG 1
+
+#!trydef KZ_PRESENCE_AMQP_PUBLISH 0
+
+#!trydef KZ_PRESENCE_REQUEST_RESUBSCRIBE_PROBE 0
+#!trydef KZ_PRESENCE_REQUEST_PROBE 1
+
 modparam("htable", "htable", "p=>size=32;autoexpire=3600;")
 modparam("htable", "htable", "first=>size=32;autoexpire=3600;initval =0;updateexpire=1;")
 
diff --git a/kamailio/sip_trace-role.cfg b/kamailio/sip_trace-role.cfg
index cbd286a..70ae4a2 100644
--- a/kamailio/sip_trace-role.cfg
+++ b/kamailio/sip_trace-role.cfg
@@ -1,5 +1,18 @@
+#################################
+## SIP_TRACE_ROLE Defs
+
+#!trydef KZ_TRACE 0
+#!trydef KZ_TRACE_INTERNAL 1
+#!trydef KZ_TRACE_EXTERNAL 1
+#!trydef KZ_TRACE_INTERNAL_INCOMING 1
+#!trydef KZ_TRACE_INTERNAL_OUTGOING 1
+#!trydef KZ_TRACE_EXTERNAL_INCOMING 1
+#!trydef KZ_TRACE_EXTERNAL_OUTGOING 1
+#!trydef SIP_TRACE_URI "sip:127.0.0.1:9060"
+#!trydef HEP_CAPTURE_ID 1
+
 ##############################################################
-## Kamailio siptrace settings configration examples at runtime
+## Kamailio siptrace settings configuration examples at runtime
 ## kamcmd siptrace.status on
 ## kamcmd cfg.seti kazoo trace_external 0
 ## kamcmd cfg.seti kazoo trace_internal 0