diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2
index 11a73c55e5..ec129bf1ca 100644
--- a/ansible/roles/common/templates/heka.json.j2
+++ b/ansible/roles/common/templates/heka.json.j2
@@ -15,6 +15,27 @@
             "owner": "heka",
             "perm": "0600"
         },
+        {
+            "source": "{{ container_config_directory }}/heka-aodh.toml",
+            "dest": "/etc/heka/heka-aodh.toml",
+            "owner": "heka",
+            "perm": "0600",
+            "optional": {{ (not enable_aodh | bool) | string | lower }}
+        },
+        {
+            "source": "{{ container_config_directory }}/heka-gnocchi.toml",
+            "dest": "/etc/heka/heka-gnocchi.toml",
+            "owner": "heka",
+            "perm": "0600",
+            "optional": {{ (not enable_gnocchi | bool) | string | lower }}
+        },
+        {
+            "source": "{{ container_config_directory }}/heka-barbican.toml",
+            "dest": "/etc/heka/heka-barbican.toml",
+            "owner": "heka",
+            "perm": "0600",
+            "optional": {{ (not enable_barbican | bool) | string | lower }}
+        },
         {
             "source": "{{ container_config_directory }}/heka-custom.toml",
             "dest": "/etc/heka/heka-custom.toml",