diff --git a/opencontrail/files/3.0/contrail-alarm-gen.conf b/opencontrail/files/3.0/contrail-alarm-gen.conf
index 6ebc244..d14cab0 100644
--- a/opencontrail/files/3.0/contrail-alarm-gen.conf
+++ b/opencontrail/files/3.0/contrail-alarm-gen.conf
@@ -12,13 +12,14 @@
 log_file = /var/log/contrail/contrail-alarm-gen.log
 kafka_broker_list = {% for member in collector.database.members %}{{ member.host }}:9092 {% endfor %}
 zk_list = {% for member in collector.database.members %}{{ member.host }}:2181{% if not loop.last %},{% endif %}{% endfor %}
-{%- if collector.message_queue.members is defined %}
-rabbitmq_server_list={{ collector.message_queue.members|join(',',attribute='host') }}
+{%- if collector.get('message_queue', {}).members is defined %}
+rabbitmq_server_list={{ collector.message_queue.members | join(',', attribute='host') }}
 rabbitmq_ha_mode=True
-{%- else %}
-rabbitmq_server_list={{ collector.message_queue.host }}
-{%- endif %}
 rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
+{%- elif collector.get('message_queue', {}).host is defined %}
+rabbitmq_server_list={{ collector.message_queue.host }}
+rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
+{%- endif %}
 
 [DISCOVERY]
 disc_server_ip = {{ collector.discovery.host }}
diff --git a/opencontrail/files/4.0/contrail-alarm-gen.conf b/opencontrail/files/4.0/contrail-alarm-gen.conf
index ad2fbbf..ae8ea5e 100644
--- a/opencontrail/files/4.0/contrail-alarm-gen.conf
+++ b/opencontrail/files/4.0/contrail-alarm-gen.conf
@@ -11,8 +11,15 @@
 partitions=30
 zk_list = {% for member in collector.database.members %}{{ member.host }}:2182 {% endfor %}
 #rabbitmq_server_list = xx.xx.xx.xx
-rabbitmq_server_list = {{ collector.message_queue.host }}
-rabbitmq_port = 5672
+{%- if collector.get('message_queue', {}).members is defined %}
+rabbitmq_server_list={{ collector.message_queue.members | join(',', attribute='host') }}
+rabbitmq_ha_mode=True
+rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
+{%- elif collector.get('message_queue', {}).host is defined %}
+rabbitmq_server_list={{ collector.message_queue.host }}
+rabbitmq_port={{ collector.get('message_queue', {}).get('port', 5672) }}
+{%- endif %}
+
 
 [API_SERVER]
 # List of api-servers in ip:port format separated by space