diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index e76d02e9..25ce7adc 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -118,9 +118,9 @@ class webserver($enabled=true) {
 }
 
 class servicemonitor {
-   $nagios_ip_v4 = join(hiera('nagios_ip_v4')," ");
-   ufw::allow { "allow-servicemonitor-from-nagios":
-      ip   => $nagios_ip_v4,
+   $nagios_ip_v4 = hiera_array('nagios_ip_v4',[]);
+   sunet::misc::ufw_allow { "allow-servicemonitor-from-nagios":
+      from   => $nagios_ip_v4,
       port => '444',
    }
 }