diff --git a/aodh/files/mitaka/aodh.conf.Debian b/aodh/files/mitaka/aodh.conf.Debian
index 938e9d0..20b1853 100644
--- a/aodh/files/mitaka/aodh.conf.Debian
+++ b/aodh/files/mitaka/aodh.conf.Debian
@@ -21,6 +21,9 @@
 
 # The topic that aodh uses for event alarm evaluation. (string value)
 #event_alarm_topic = alarm.all
+{%- if server.event_alarm_topic is defined %}
+event_alarm_topic = {{ server.event_alarm_topic }}
+{%- endif %}
 
 # The protocol used to communicate between evaluator and notifier
 # services. (string value)
diff --git a/aodh/files/newton/aodh.conf.Debian b/aodh/files/newton/aodh.conf.Debian
index 7afacdb..06d8f76 100644
--- a/aodh/files/newton/aodh.conf.Debian
+++ b/aodh/files/newton/aodh.conf.Debian
@@ -847,6 +847,9 @@
 # The topic that aodh uses for event alarm evaluation. (string value)
 # Deprecated group/name - [DEFAULT]/event_alarm_topic
 #event_alarm_topic = alarm.all
+{%- if server.event_alarm_topic is defined %}
+event_alarm_topic = {{ server.event_alarm_topic }}
+{%- endif %}
 
 # Number of notification messages to wait before dispatching them. (integer
 # value)
diff --git a/aodh/files/ocata/aodh.conf.Debian b/aodh/files/ocata/aodh.conf.Debian
index 7afacdb..06d8f76 100644
--- a/aodh/files/ocata/aodh.conf.Debian
+++ b/aodh/files/ocata/aodh.conf.Debian
@@ -847,6 +847,9 @@
 # The topic that aodh uses for event alarm evaluation. (string value)
 # Deprecated group/name - [DEFAULT]/event_alarm_topic
 #event_alarm_topic = alarm.all
+{%- if server.event_alarm_topic is defined %}
+event_alarm_topic = {{ server.event_alarm_topic }}
+{%- endif %}
 
 # Number of notification messages to wait before dispatching them. (integer
 # value)
diff --git a/aodh/files/pike/aodh.conf.Debian b/aodh/files/pike/aodh.conf.Debian
index e1d454e..c73d183 100644
--- a/aodh/files/pike/aodh.conf.Debian
+++ b/aodh/files/pike/aodh.conf.Debian
@@ -851,6 +851,9 @@
 # The topic that aodh uses for event alarm evaluation. (string value)
 # Deprecated group/name - [DEFAULT]/event_alarm_topic
 #event_alarm_topic = alarm.all
+{%- if server.event_alarm_topic is defined %}
+event_alarm_topic = {{ server.event_alarm_topic }}
+{%- endif %}
 
 # Number of notification messages to wait before dispatching them. (integer
 # value)
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 4a630aa..5f0cd1b 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -5,6 +5,7 @@
     version: mitaka
     cluster: true
     ttl: 86400
+    event_alarm_topic: alarm.all
     bind:
       host: 127.0.0.1
       port: 8042
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index 22159a5..6fbb80d 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -5,6 +5,7 @@
     version: mitaka
     cluster: true
     ttl: 86400
+    event_alarm_topic: alarm.all
     bind:
       host: 127.0.0.1
       port: 8042