diff --git a/manifests/config.pp b/manifests/config.pp
index 6eef367..7f51344 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -37,17 +37,13 @@
 
   $_piddir = dirname($opendkim::pidfile)
   if fact('os.family') == 'RedHat' {
-    file_line { "${opendkim::service_name}.service RuntimeDirectory":
-      path  => "/usr/lib/systemd/system/${opendkim::service_name}.service",
-      line  => "RuntimeDirectory=${basename($_piddir)}",
-      match => '^RuntimeDirectory=',
-      after => '^Restart=',
-    }
-    -> file_line { "${opendkim::service_name}.service RuntimeDirectoryMode":
-      path  => "/usr/lib/systemd/system/${opendkim::service_name}.service",
-      line  => "RuntimeDirectoryMode=${opendkim::rundir_mode}",
-      match => '^RuntimeDirectoryMode=',
-      after => '^RuntimeDirectory=',
+    systemd::manage_dropin { "${opendkim::service_name}.service.d/RuntimeDirectory.conf":
+      unit          => "${opendkim::service_name}.service",
+      filename      => 'RuntimeDirectory.conf',
+      service_entry => {
+        'RuntimeDirectory'     => basename($_piddir),
+        'RuntimeDirectoryMode' => $opendkim::rundir_mode,
+      },
     }
 
     file { '/etc/tmpfiles.d/opendkim.conf':
diff --git a/manifests/init.pp b/manifests/init.pp
index d6726a4..9378757 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -151,6 +151,7 @@
   Optional[Variant[Boolean,Enum['yes','no']]] $autorestart            = undef,
   Optional[Pattern[/\A[0-9]+\/[0-9]+[sSmMhHdD]\z/]] $autorestartrate  = undef,
 ) {
+
   if $publickeyextended {
     deprecation(
       'opendkim::publickeyextended',
@@ -159,13 +160,13 @@
     )
   }
 
-  contain opendkim::install
   contain opendkim::user
+  contain opendkim::install
   contain opendkim::config
   contain opendkim::service
 
-  Class['opendkim::install']
-  -> Class['opendkim::user']
+  Class['opendkim::user']
+  -> Class['opendkim::install']
   -> Class['opendkim::config']
   ~> Class['opendkim::service']
 }
diff --git a/metadata.json b/metadata.json
index d1f135e..833e758 100644
--- a/metadata.json
+++ b/metadata.json
@@ -7,12 +7,6 @@
   "source": "https://github.com/lvicainne/puppet-opendkim",
   "project_page": "http://github.com/lvicainne/puppet-opendkim",
   "issues_url": "https://github.com/lvicainne/puppet-opendkim/issues",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 10.0.0"
-    }
-  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -54,6 +48,16 @@
       ]
     }
   ],
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.0 < 10.0.0"
+    },
+    {
+      "name": "puppet/systemd",
+      "version_requirement": ">= 6.1.0 < 8.0.0"
+    }
+  ],
   "requirements": [
     {
       "name": "puppet",