diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp
index a1201ee..2cab0b3 100644
--- a/dns/manifests/init.pp
+++ b/dns/manifests/init.pp
@@ -513,13 +513,13 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                 notify      => Service["named"],
             }
 
-            Dns::Node::Record <<| tag == $zone |>> {
+            Dns::Node::Record <<| tag == "dnsrec-${zone}" |>> {
                 dbdir   => "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d",
                 notify  => Exec["update-db.${zonefile}-dynamic"],
                 require => File["${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic",
                                 "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d"],
             }
-            Dns::Node::Record::Reverse <<| tag == $zone |>> {
+            Dns::Node::Record::Reverse <<| tag == "dnsptr-${zone}" |>> {
                 dbdir   => "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d",
                 notify  => Exec["update-db.${zonefile}-dynamic"],
                 require => File["${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic",
@@ -579,7 +579,7 @@ class dns::node {
         ipaddr => $dns_node_ipaddr,
         host   => $dns_node_name,
         cname  => $dns_node_cname,
-        tag    => $dns_node_zone
+        tag    => "dnsrec-${dns_node_zone}",
     }
 
     $dns_node_class = inline_template("<%= @dns_node_netmask.scan('255.').length -%>")
@@ -589,7 +589,7 @@ class dns::node {
     @@dns::node::record::reverse { "${dns_node_name}.${dns_node_zone}":
         ipaddr => $dns_node_raddr,
         host   => "${dns_node_name}.${dns_node_zone}",
-        tag    => $dns_node_rzone
+        tag    => "dnsptr-${dns_node_rzone}",
     }
 
 }