diff --git a/Puppetfile b/Puppetfile
index fd87de8..94caeb9 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -5,8 +5,9 @@ moduledir 'external_modules'
 mod 'puppetlabs-stdlib', '9.1.0'
 mod 'puppetlabs-inifile', '6.0.0'
 mod 'puppetlabs-concat', '9.0.0'
-mod 'eyp-eyplib', '0.1.24'
-mod 'eyp-systemd', '3.1.0'
+#mod 'eyp-eyplib', '0.1.24'
+#mod 'eyp-systemd', '3.1.0'
+mod 'puppet-systemd', '5.1.0'
 mod 'ghoneycutt-puppet', '3.3.0'
 mod 'puppet-archive', '7.0.0'
 mod 'puppet-chrony', '2.6.0'
diff --git a/site/profiles/manifests/puppet/enc.pp b/site/profiles/manifests/puppet/enc.pp
index 897cc98..5ab06ef 100644
--- a/site/profiles/manifests/puppet/enc.pp
+++ b/site/profiles/manifests/puppet/enc.pp
@@ -67,17 +67,33 @@ class profiles::puppet::enc (
     require => Package['git'],
   }
 
-  systemd::service { 'puppet-enc':
-    description => 'puppet-enc update service',
-    execstart   => '/opt/puppetlabs/bin/puppet-enc',
-    user        => 'root',
-    require     => File['/opt/puppetlabs/bin/puppet-enc'],
-  }
+  $_timer = @(EOT)
+  [Unit]
+  Description=puppet-enc downloader timer
+  [Timer]
+  OnCalendar=*:0/1
+  RandomizedDelaySec=1s
+  [Install]
+  WantedBy=timers.target
+  EOT
 
-  systemd::timer { 'puppet-enc':
-    description => 'Run puppet-enc every minute',
-    unit        => 'puppet-enc.service',
-    on_calendar => '*:0/1',
-    require     => Systemd::Service['puppet-enc'],
+  $_service = @(EOT)
+  [Unit]
+  Description=puppet-enc downloader service
+  [Service]
+  Type=oneshot
+  ExecStart=/opt/puppetlabs/bin/puppet-enc
+  User=root
+  Group=root
+  PermissionsStartOnly=false
+  PrivateTmp=no
+  EOT
+
+  systemd::timer { 'puppet-enc.timer':
+    timer_content   => $_timer,
+    service_content => $_service,
+    active          => true,
+    enable          => true,
+    require         => File['/opt/puppetlabs/bin/puppet-enc'],
   }
 }
diff --git a/site/profiles/manifests/puppet/g10k.pp b/site/profiles/manifests/puppet/g10k.pp
index 72e5309..958e53e 100644
--- a/site/profiles/manifests/puppet/g10k.pp
+++ b/site/profiles/manifests/puppet/g10k.pp
@@ -54,17 +54,33 @@ class profiles::puppet::g10k {
     require => Archive['/tmp/g10k.zip'],
   }
 
-  systemd::service { 'puppet-g10k':
-    description => 'puppet-g10k update service',
-    execstart   => '/opt/puppetlabs/bin/puppet-g10k',
-    user        => 'root',
-    require     => File['/opt/puppetlabs/bin/puppet-g10k'],
-  }
+  $_timer = @(EOT)
+  [Unit]
+  Description=puppet-g10k downloader timer
+  [Timer]
+  OnCalendar=*:0/1
+  RandomizedDelaySec=1s
+  [Install]
+  WantedBy=timers.target
+  EOT
 
-  systemd::timer { 'puppet-g10k':
-    description => 'Run puppet-g10k every minute',
-    unit        => 'puppet-g10k.service',
-    on_calendar => '*:0/1',
-    require     => Systemd::Service['puppet-g10k'],
+  $_service = @(EOT)
+  [Unit]
+  Description=puppet-g10k downloader service
+  [Service]
+  Type=oneshot
+  ExecStart=/opt/puppetlabs/bin/puppet-g10k
+  User=root
+  Group=root
+  PermissionsStartOnly=false
+  PrivateTmp=no
+  EOT
+
+  systemd::timer { 'puppet-g10k.timer':
+    timer_content   => $_timer,
+    service_content => $_service,
+    active          => true,
+    enable          => true,
+    require         => File['/opt/puppetlabs/bin/puppet-g10k'],
   }
 }