diff --git a/src/lib/charm/openstack/designate.py b/src/lib/charm/openstack/designate.py
index ea9c6da..7377d9b 100644
--- a/src/lib/charm/openstack/designate.py
+++ b/src/lib/charm/openstack/designate.py
@@ -37,6 +37,7 @@ RNDC_KEY_CONF = DESIGNATE_DIR + '/rndc.key'
 NOVA_SINK_FILE = DESIGNATE_DIR + '/conf.d/nova_sink.cfg'
 NEUTRON_SINK_FILE = DESIGNATE_DIR + '/conf.d/neutron_sink.cfg'
 RC_FILE = '/root/novarc'
+openstack_charm.use_defaults('charm.default-select-release')
 
 
 class DesignateDBAdapter(openstack_adapters.DatabaseRelationAdapter):
@@ -581,8 +582,8 @@ class DesignateCharm(openstack_charm.HAOpenStackCharm):
 
 class DesignateCharmQueens(DesignateCharm):
 
-    # This charms support Ocata and onward
-    release = 'ocata'
+    # This charms support Queens and onward
+    release = 'queens'
 
     services = ['designate-mdns', 'designate-zone-manager',
                 'designate-agent', 'designate-pool-manager',
diff --git a/src/templates/mitaka/pools.yaml b/src/templates/mitaka/pools.yaml
index 2e6a34c..72c60d1 100644
--- a/src/templates/mitaka/pools.yaml
+++ b/src/templates/mitaka/pools.yaml
@@ -2,8 +2,8 @@
   name: default
   description: Pool genergated by Juju
 
-  ns_records:
 {% if options.ns_records %}
+  ns_records:
 {% for record in options.ns_records %}
     - hostname: {{ record }}
       priority: 10