diff --git a/roles/maas/files/cnames.inc b/roles/maas/files/cnames.inc
new file mode 100644
index 0000000..26b78d8
--- /dev/null
+++ b/roles/maas/files/cnames.inc
@@ -0,0 +1,13 @@
+nagios                  CNAME nagios-1
+openstack-dashboard     CNAME openstack-dashboard-1
+onos-fabric             CNAME onos-fabric-1
+xos                     CNAME xos-1
+juju                    CNAME juju-1
+neutron-api             CNAME neutron-api-1
+rabbitmq-server         CNAME rabbitmq-server-1
+ceilometer              CNAME ceilometer-1
+nova-cloud-controller   CNAME nova-cloud-controller-1
+glance                  CNAME glance-1
+keystone                CNAME keystone-1
+onos-cord               CNAME onos-cord-1
+percona-cluster         CNAME percona-cluster-1
diff --git a/roles/maas/files/update_dns_template.sh b/roles/maas/files/update_dns_template.sh
index 659a799..91bc01f 100755
--- a/roles/maas/files/update_dns_template.sh
+++ b/roles/maas/files/update_dns_template.sh
@@ -58,6 +58,7 @@
 \$INCLUDE "/etc/bind/maas/dhcp_harvest.inc"
 $HOSTNAME IN A $LHOST
 docker-registry CNAME $HOSTNAME
+\$INCLUDE "/etc/bind/maas/cnames.inc"
 {{endif}}
 EOT
 
diff --git a/roles/maas/tasks/main.yml b/roles/maas/tasks/main.yml
index 2f3490d..a99abcb 100644
--- a/roles/maas/tasks/main.yml
+++ b/roles/maas/tasks/main.yml
@@ -235,6 +235,7 @@
     - { src: 'dhcpd.blacklist', dest: '/etc/dhcp' }
     - { src: 'dhcpd.reservations', dest: '/etc/dhcp' }
     - { src: 'dhcp_harvest.inc', dest: '/etc/bind/maas' }
+    - { src: 'cnames.inc', dest: '/etc/bind/maas' }
     - { src: 'named.conf.options.inside.maas', dest: '/etc/bind/maas' }
     - { src: 'dhcpd.conf.template', dest: '/etc/maas/templates/dhcp' }
     - { src: 'dhcp_harvest.inc', dest: '/etc/maas/templates/dns' }