diff --git a/lib/ceilometer_utils.py b/lib/ceilometer_utils.py
index e339eef..50f7810 100644
--- a/lib/ceilometer_utils.py
+++ b/lib/ceilometer_utils.py
@@ -168,6 +168,10 @@ QUEENS_CONFIG_FILES = OrderedDict([
             CeilometerContext()],
         'services': QUEENS_SERVICES
     }),
+    (PIPELINE_CONF, {
+        'hook_contexts': [RemoteSinksContext()],
+        'services': QUEENS_SERVICES,
+    }),
 ])
 
 CONFIG_FILES = OrderedDict([
@@ -210,6 +214,10 @@ CONFIG_FILES = OrderedDict([
         'hook_contexts': [ApacheSSLContext()],
         'services': ['ceilometer-api', 'apache2'],
     }),
+    (PIPELINE_CONF, {
+        'hook_contexts': [RemoteSinksContext()],
+        'services': ['ceilometer-collector'],
+    }),
 ])
 
 TEMPLATES = 'templates'
@@ -240,7 +248,6 @@ def register_configs():
     if CompareOpenStackReleases(release) >= 'queens':
         for conf in QUEENS_CONFIG_FILES:
             configs.register(conf, QUEENS_CONFIG_FILES[conf]['hook_contexts'])
-        configs.register(PIPELINE_CONF, [RemoteSinksContext()])
     else:
         for conf in (CEILOMETER_CONF, HAPROXY_CONF):
             configs.register(conf, CONFIG_FILES[conf]['hook_contexts'])
@@ -274,7 +281,9 @@ def register_configs():
                  HAProxyContext()]
             )
         if CompareOpenStackReleases(release) >= 'mitaka':
-            configs.register(PIPELINE_CONF, [RemoteSinksContext()])
+            conf = PIPELINE_CONF
+            configs.register(conf, CONFIG_FILES[conf]['hook_contexts'])
+
     return configs
 
 
diff --git a/unit_tests/test_ceilometer_utils.py b/unit_tests/test_ceilometer_utils.py
index 944eab5..7288150 100644
--- a/unit_tests/test_ceilometer_utils.py
+++ b/unit_tests/test_ceilometer_utils.py
@@ -137,7 +137,8 @@ class CeilometerUtilsTest(CharmTestCase):
              "/etc/apache2/sites-available/openstack_https_frontend": [
                  'ceilometer-api', 'apache2'],
              "/etc/apache2/sites-available/openstack_https_frontend.conf": [
-                 'ceilometer-api', 'apache2']
+                 'ceilometer-api', 'apache2'],
+             "/etc/ceilometer/event_pipeline.yaml": ['ceilometer-collector'],
              }
         )
 
@@ -163,7 +164,8 @@ class CeilometerUtilsTest(CharmTestCase):
              "/etc/apache2/sites-available/openstack_https_frontend": [
                  'ceilometer-api', 'apache2'],
              "/etc/apache2/sites-available/openstack_https_frontend.conf": [
-                 'ceilometer-api', 'apache2']
+                 'ceilometer-api', 'apache2'],
+             "/etc/ceilometer/event_pipeline.yaml": ['ceilometer-collector'],
              }
         )
 
@@ -181,6 +183,9 @@ class CeilometerUtilsTest(CharmTestCase):
              '/etc/ceilometer/polling.yaml': [
                 'ceilometer-agent-central',
                 'ceilometer-agent-notification'],
+             '/etc/ceilometer/event_pipeline.yaml': [
+                'ceilometer-agent-central',
+                'ceilometer-agent-notification'],
              }
         )