diff --git a/manifests/config.pp b/manifests/config.pp
index 94980a5..0fdc9ae 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,146 +1,151 @@
 # == Class grafana::config
 #
 # This class is called from grafana
 #
 class grafana::config {
   case $grafana::install_method {
     'docker': {
       if $grafana::container_cfg {
         $cfg = $grafana::cfg
         $myprovision = false
 
         file {  'grafana.ini':
           ensure  => file,
           path    => $grafana::cfg_location,
           content => template('grafana/config.ini.erb'),
           owner   => 'grafana',
           group   => 'grafana',
+          notify  => Class['grafana::service'],
         }
       }
     }
     'package','repo': {
       $cfg = $grafana::cfg
       $myprovision = true
 
       file {  'grafana.ini':
         ensure  => file,
         path    => $grafana::cfg_location,
         content => template('grafana/config.ini.erb'),
         owner   => 'grafana',
         group   => 'grafana',
+        notify  => Class['grafana::service'],
       }
 
       $sysconfig = $grafana::sysconfig
       $sysconfig_location = $grafana::sysconfig_location
 
       if $sysconfig_location and $sysconfig {
         $changes = $sysconfig.map |$key, $value| { "set ${key} ${value}" }
 
         augeas{'sysconfig/grafana-server':
           context => "/files${$sysconfig_location}",
           changes => $changes,
+          notify  => Class['grafana::service'],
         }
       }
 
       file { "${grafana::data_dir}/plugins":
         ensure => directory,
         owner  => 'grafana',
         group  => 'grafana',
         mode   => '0750',
       }
     }
     'archive': {
       $cfg = $grafana::cfg
       $myprovision = true
 
       file { "${grafana::install_dir}/conf/custom.ini":
         ensure  => file,
         content => template('grafana/config.ini.erb'),
         owner   => 'grafana',
         group   => 'grafana',
+        notify  => Class['grafana::service'],
       }
 
       file { [$grafana::data_dir, "${grafana::data_dir}/plugins"]:
         ensure => directory,
         owner  => 'grafana',
         group  => 'grafana',
         mode   => '0750',
       }
     }
     default: {
       fail("Installation method ${grafana::install_method} not supported")
     }
   }
 
   if $grafana::ldap_cfg {
     $ldap_cfg = $grafana::ldap_cfg
     file { '/etc/grafana/ldap.toml':
       ensure  => file,
       content => inline_template("<%= require 'toml'; TOML::Generator.new(@ldap_cfg).body %>\n"),
       owner   => 'grafana',
       group   => 'grafana',
+      notify  => Class['grafana::service'],
     }
   }
 
   # If grafana version is > 5.0.0, and the install method is package,
   # repo, or archive, then use the provisioning feature. Dashboards
   # and datasources are placed in
   # /etc/grafana/provisioning/[dashboards|datasources] by default.
   # --dashboards--
   if ((versioncmp($grafana::version, '5.0.0') >= 0) and ($myprovision)) {
     $pdashboards = $grafana::provisioning_dashboards
     if (length($pdashboards) >= 1 ) {
       $dashboardpaths = flatten(grafana::deep_find_and_remove('options', $pdashboards))
       # template uses:
       #   - pdashboards
       file { $grafana::provisioning_dashboards_file:
         ensure  => file,
         owner   => 'grafana',
         group   => 'grafana',
         mode    => '0640',
         content => epp('grafana/pdashboards.yaml.epp'),
-        notify  => Service['grafana'],
+        notify  => Class['grafana::service'],
       }
       # Loop over all providers, extract the paths and create
       # directories for each path of dashboards.
       $dashboardpaths.each | Integer $index, Hash $options | {
         if ('path' in $options) {
           # get sub paths of 'path' and create subdirs if necessary
           $subpaths = grafana::get_sub_paths($options['path'])
           if ($grafana::create_subdirs_provisioning and (length($subpaths) >= 1)) {
             file { $subpaths :
               ensure => directory,
               before => File[$options['path']],
             }
           }
 
           file { $options['path'] :
             ensure  => directory,
             owner   => 'grafana',
             group   => 'grafana',
             mode    => '0750',
             recurse => true,
             purge   => true,
             source  => $options['puppetsource'],
           }
         }
       }
     }
 
     # --datasources--
     $pdatasources = $grafana::provisioning_datasources
     if (length($pdatasources) >= 1) {
       # template uses:
       #   - pdatasources
       file { $grafana::provisioning_datasources_file:
         ensure  => file,
         owner   => 'grafana',
         group   => 'grafana',
         mode    => '0640',
         content => epp('grafana/pdatasources.yaml.epp'),
-        notify  => Service['grafana'],
+        notify  => Class['grafana::service'],
       }
     }
 
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index e7ab1cc..c05eea4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,150 +1,150 @@
 # == Class: grafana
 #
 # Installs and configures Grafana.
 #
 # === Parameters
 # [*archive_source*]
 # Download location of tarball to be used with the 'archive' install method.
 # Defaults to the URL of the latest version of Grafana available at the time of module release.
 #
 # [*container_cfg*]
 # Boolean. Determines whether a configuration file should be generated when using the 'docker' install method.
 # If true, use the `cfg` and `cfg_location` parameters to control creation of the file.
 # Defaults to false.
 #
 # [*container_params*]
 # Hash of parameters to use when creating the Docker container. For use with the 'docker' install method.
 # Refer to documentation of the `docker::run` resource in the `garethr-docker` module for details of available parameters.
 # Defaults to:
 #
 #   container_params => {
 #     'image' => 'grafana/grafana:latest',
 #     'ports' => '3000'
 #   }
 #
 # [*data_dir*]
 # The directory Grafana will use for storing its data.
 # Defaults to '/var/lib/grafana'.
 #
 # [*install_dir*]
 # Installation directory to be used with the 'archive' install method.
 # Defaults to '/usr/share/grafana'.
 #
 # [*install_method*]
 # Set to 'archive' to install Grafana using the tar archive.
 # Set to 'docker' to install Grafana using the official Docker container.
 # Set to 'package' to install Grafana using .deb or .rpm packages.
 # Set to 'repo' to install Grafana using an apt or yum repository.
 # Defaults to 'package'.
 #
 # [*manage_package_repo*]
 # If true this will setup the official grafana repositories on your host. Defaults to true.
 #
 # [*package_name*]
 # The name of the package managed with the 'package' install method.
 # Defaults to 'grafana'.
 #
 # [*package_source*]
 # Download location of package to be used with the 'package' install method.
 # Defaults to the URL of the latest version of Grafana available at the time of module release.
 #
 # [*service_name*]
 # The name of the service managed with the 'archive' and 'package' install methods.
 # Defaults to 'grafana-server'.
 #
 # [*version*]
 # The version of Grafana to install and manage.
 # Defaults to 'installed'
 #
 # [*repo_name*]
 # When using 'repo' install_method, the repo to look for packages in.
 # Set to 'stable' to install only stable versions
 # Set to 'beta' to install beta versions
 # Defaults to stable.
 #
 # [*plugins*]
 # A hash of plugins to be passed to `create_resources`, wraps around the
 # `grafana_plugin` resource.
 #
 # [*provisioning_dashboards*]
 # Hash of dashboards to provision into grafana. grafana > v5.0.0
 # required. Hash will be converted into YAML and used by grafana to
 # provision dashboards.
 #
 # [*provisioning_datasources*]
 # Hash of datasources to provision into grafana, grafana > v5.0.0
 # required. Hash will be converted into YAML and used by granfana to
 # configure datasources.
 #
 # [*provisioning_dashboards_file*]
 # String with the fully qualified path to place the provisioning file
 # for dashboards, only used if provisioning_dashboards is specified.
 # Defaults to '/etc/grafana/provisioning/dashboards/puppetprovisioned.yaml'
 #
 # [*provisioning_datasources_file*]
 # String with the fully qualified path to place the provisioning file
 # for datasources, only used if provisioning_datasources is specified.
 # Default to '/etc/grafana/provisioning/datasources/puppetprovisioned.yaml'
 #
 # [*create_subdirs_provisioning*]
 # Boolean, defaults to false. If true puppet will create any
 # subdirectories in the given path when provisioning dashboards.
 #
 # [*sysconfig_location*]
 # Location of the sysconfig file for the environment of the grafana-server service.
 # This is only used when the install_method is 'package' or 'repo'.
 #
 # [*sysconfig*]
 # A hash of environment variables for the grafana-server service
 #
 # Example:
 #   sysconfig => { 'http_proxy' => 'http://proxy.example.com/' }
 #
 # === Examples
 #
 #  class { '::grafana':
 #    install_method  => 'docker',
 #  }
 #
 class grafana (
   Optional[String] $archive_source,
   String $cfg_location,
   Hash $cfg,
   Optional[Hash] $ldap_cfg,
   Boolean $container_cfg,
   Hash $container_params,
   String $docker_image,
   String $docker_ports,
   String $data_dir,
   String $install_dir,
   String $install_method,
   Boolean $manage_package_repo,
   String $package_name,
   Optional[String] $package_source,
   Enum['stable', 'beta'] $repo_name,
   String $rpm_iteration,
   String $service_name,
   String $version,
   Hash $plugins,
   Hash $provisioning_dashboards,
   Hash $provisioning_datasources,
   String $provisioning_dashboards_file,
   String $provisioning_datasources_file,
   Boolean $create_subdirs_provisioning,
   Optional[String] $sysconfig_location,
   Optional[Hash] $sysconfig,
 ) {
 
   contain grafana::install
   contain grafana::config
   contain grafana::service
 
   Class['grafana::install']
   -> Class['grafana::config']
-  ~> Class['grafana::service']
+  -> Class['grafana::service']
 
   create_resources(grafana_plugin, $plugins)
   # Dependency added for Grafana_plugins to ensure it runs at the
   # correct time.
   Class['grafana::config'] -> Grafana_Plugin <| |> ~> Class['grafana::service']
 }