diff --git a/designate/notification_handler/neutron.py b/designate/notification_handler/neutron.py
index 2366562d9..d5c17e0e8 100644
--- a/designate/notification_handler/neutron.py
+++ b/designate/notification_handler/neutron.py
@@ -67,6 +67,8 @@ class NeutronFloatingHandler(BaseAddressHandler):
                     'version': 4,
                     'address': payload['floatingip']['floating_ip_address']
                 }
+                payload['floatingip']['project'] = getattr(
+                    context, 'tenant', None)
                 self._create(addresses=[address],
                              extra=payload['floatingip'],
                              zone_id=zone_id,
diff --git a/designate/notification_handler/nova.py b/designate/notification_handler/nova.py
index 70870535d..7a937640a 100644
--- a/designate/notification_handler/nova.py
+++ b/designate/notification_handler/nova.py
@@ -62,6 +62,7 @@ class NovaFixedHandler(BaseAddressHandler):
 
         zone_id = cfg.CONF[self.name].zone_id
         if event_type == 'compute.instance.create.end':
+            payload['project'] = getattr(context, 'tenant', None)
             self._create(addresses=payload['fixed_ips'],
                          extra=payload,
                          zone_id=zone_id,
diff --git a/etc/designate/designate.conf.sample b/etc/designate/designate.conf.sample
index b6b28fbbf..49477e3a5 100644
--- a/etc/designate/designate.conf.sample
+++ b/etc/designate/designate.conf.sample
@@ -399,6 +399,7 @@ debug = False
 #notification_topics = notifications
 #control_exchange = 'nova'
 #format = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s'
+#format = '%(hostname)s.%(project)s.%(domain)s'
 #format = '%(hostname)s.%(domain)s'
 
 #------------------------
@@ -410,6 +411,7 @@ debug = False
 #notification_topics = notifications
 #control_exchange = 'neutron'
 #format = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s'
+#format = '%(hostname)s.%(project)s.%(domain)s'
 #format = '%(hostname)s.%(domain)s'
 
 #############################