diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index cbf1ff00..a6631917 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -158,6 +158,13 @@ class eidas_hsm_client($luna_version="6.2") {
       volumes  => ['/dev/log:/dev/log','/etc/Chrystoki.conf.d:/etc/Chrystoki.conf.d','/etc/luna/cert:/usr/safenet/lunaclient/cert'],
       env      => ["PKCS11PIN=${pkcs11pin}"]
    }
+   sunet::scriptherder::cronjob { "${name}_restart_hsmproxy":
+     cmd           => "/usr/sbin/service docker-${name}_hsmproxy restart'",
+     minute        => '9',
+     hour          => '0',
+     ok_criteria   => ['exit_status=0','max_age=48h'],
+     warn_criteria => ['exit_status=1','max_age=50h'],
+   }
 }
 
 class md_signer($dest_host=undef,$dest_dir="") {
@@ -168,13 +175,6 @@ class md_signer($dest_host=undef,$dest_dir="") {
       pipeline          => "${name}.fd",
       volumes           => ["/etc/credentials:/etc/credentials"]
    }
-   sunet::scriptherder::cronjob { "${name}_restart_hsmproxy":
-     cmd           => "/usr/sbin/service docker-${name}-hsmproxy restart'",
-     minute        => '9',
-     hour          => '0',
-     ok_criteria   => ['exit_status=0','max_age=48h'],
-     warn_criteria => ['exit_status=1','max_age=50h'],
-   }
    if ($dest_host) {
       sunet::ssh_host_credential { "${name}-publish-credential":
          hostname          => $dest_host,