diff --git a/heka/files/output/amqp.toml b/heka/files/output/amqp.toml
index 5378764..031457d 100644
--- a/heka/files/output/amqp.toml
+++ b/heka/files/output/amqp.toml
@@ -1,4 +1,4 @@
-{% if not pillar.heka.server.output.rabbitmq == 'false' %}
+{% if not pillar.heka.server.output.rabbitmq.enabled == False %}
 [AMQPOutput_{{ name }}]
 type = "AMQPOutput"
 url = "amqp://{{ values.user }}:{{ values.password }}@{{ values.host }}/{{ values.vhost }}"
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index 0d0fb15..505efcf 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -46,7 +46,7 @@
           engine: dashboard
           ticker_interval: 30
         rabbitmq:
-          enable: false
+          enabled: False
       encoder:
         es_json:
           engine: es-json