diff --git a/manifests/site.pp b/manifests/site.pp
index 60703d4ab66e3a8ea23050c36cc9df889a07c984..31184b55ec09020938b3d1e70b7b8faba4f862cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,16 +51,13 @@ node 'elk-server.openstacklocal' {
 
   include logstash
 
-  file {'/etc/heartbeat/heartbeat.yml':
-    ensure => present,
-    source => 'puppet:///modules/beats_conf/heartbeat.yml',
-  }
-
+  # TODO: Chain package, file thingies
   package {'heartbeat-elastic':
     ensure => present,
-  }
-
-  service {'heartbeat-elastic':
+  }~> file {'/etc/heartbeat/heartbeat.yml':
+    ensure => present,
+    source => 'puppet:///modules/beats_conf/heartbeat.yml',
+  }~> service {'heartbeat-elastic':
     ensure => running,
     enable => true,
     require => Package['heartbeat-elastic'],