diff --git a/roles/maas/files/cnames.inc b/roles/maas/files/cnames.inc
index d3ab249..5c7b906 100644
--- a/roles/maas/files/cnames.inc
+++ b/roles/maas/files/cnames.inc
@@ -1,7 +1,6 @@
 mongodb                 CNAME mongodb-1
 nagios                  CNAME nagios-1
 openstack-dashboard     CNAME openstack-dashboard-1
-onos-fabric             CNAME onos-fabric-1
 juju                    CNAME juju-1
 neutron-api             CNAME neutron-api-1
 rabbitmq-server         CNAME rabbitmq-server-1
@@ -9,5 +8,4 @@
 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 b7db434..4b8a1ff 100755
--- a/roles/maas/files/update_dns_template.sh
+++ b/roles/maas/files/update_dns_template.sh
@@ -58,6 +58,8 @@
 \$INCLUDE "/etc/bind/maas/dhcp_harvest.inc"
 $HOSTNAME IN A $LHOST
 xos CNAME $HOSTNAME
+onos-cord CNAME $HOSTNAME
+onos-fabric CNAME $HOSTNAME
 docker-registry CNAME $HOSTNAME
 apt-cache CNAME $HOSTNAME
 mavenrepo CNAME $HOSTNAME