diff --git a/templates/named.conf.generator.j2 b/templates/named.conf.generator.j2
index 6fe2e62..7a3c4d8 100644
--- a/templates/named.conf.generator.j2
+++ b/templates/named.conf.generator.j2
@@ -33,7 +33,7 @@ options {
 {% include 'named.conf.http.j2' %}
 {% endif %}
 {% if item.keylist is defined and item.keylist %}
-{% from 'named.conf.key.j2' import keylist with context %}
+{% include 'named.conf.key.j2' %}
 {{ keylist(item.keylist) }}
 {% endif %}
 {% if item.logging is defined and item.logging %}
diff --git a/templates/named.conf.key.j2 b/templates/named.conf.key.j2
index 659aa38..70f621f 100644
--- a/templates/named.conf.key.j2
+++ b/templates/named.conf.key.j2
@@ -1,9 +1,7 @@
-{% macro keylist(keylists) %}
-{% for keyname in keylists if keylists is iterable %}
+{% for keyname in item.keylist if item.keylist is iterable %}
 key {{ keyname.name }} {
 {% filter indent(bind9_config_indent, true) %}
 {{ ('algorithm ' + keyname.algorithm + ';\n') if keyname.algorithm is defined and keyname.algorithm -}}
 {{ ('secret "' + keyname.secret + '";\n') if keyname.secret is defined and keyname.secret -}}
 {% endfilter %}};
 {% endfor %}
-{% endmacro %}
\ No newline at end of file