diff --git a/doc/notification_samples/common_payloads/InstanceActionVolumePayload.json b/doc/notification_samples/common_payloads/InstanceActionVolumePayload.json
new file mode 100644
index 000000000000..4e49c42a066e
--- /dev/null
+++ b/doc/notification_samples/common_payloads/InstanceActionVolumePayload.json
@@ -0,0 +1,9 @@
+{
+    "$ref": "InstanceActionPayload.json",
+    "nova_object.data":{
+        "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
+    },
+    "nova_object.name": "InstanceActionVolumePayload",
+    "nova_object.namespace": "nova",
+    "nova_object.version": "1.3"
+}
\ No newline at end of file
diff --git a/doc/notification_samples/common_payloads/InstanceActionVolumeSwapPayload.json b/doc/notification_samples/common_payloads/InstanceActionVolumeSwapPayload.json
new file mode 100644
index 000000000000..943cc7b84112
--- /dev/null
+++ b/doc/notification_samples/common_payloads/InstanceActionVolumeSwapPayload.json
@@ -0,0 +1,10 @@
+{
+    "$ref": "InstanceActionPayload.json",
+    "nova_object.data": {
+        "new_volume_id": "227cc671-f30b-4488-96fd-7d0bf13648d8",
+        "old_volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
+    },
+    "nova_object.name": "InstanceActionVolumeSwapPayload",
+    "nova_object.namespace": "nova",
+    "nova_object.version": "1.5"
+}
diff --git a/doc/notification_samples/instance-volume_attach-end.json b/doc/notification_samples/instance-volume_attach-end.json
index cee1b41654f5..37fe8b949ea8 100644
--- a/doc/notification_samples/instance-volume_attach-end.json
+++ b/doc/notification_samples/instance-volume_attach-end.json
@@ -1,90 +1,7 @@
 {
     "event_type": "instance.volume_attach.end",
     "payload": {
-        "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
-            "fault": null,
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "projects": null,
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "node": "fake-mini",
-            "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config": "MANUAL",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name": "InstanceActionVolumePayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.3"
+        "$ref": "common_payloads/InstanceActionVolumePayload.json#"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_attach-error.json b/doc/notification_samples/instance-volume_attach-error.json
index 4d22410c25f1..8cfc79c32882 100644
--- a/doc/notification_samples/instance-volume_attach-error.json
+++ b/doc/notification_samples/instance-volume_attach-error.json
@@ -1,25 +1,8 @@
 {
     "event_type": "instance.volume_attach.error",
     "payload": {
+        "$ref": "common_payloads/InstanceActionVolumePayload.json#",
         "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
             "fault": {
                 "nova_object.data": {
                     "exception": "CinderConnectionFailed",
@@ -30,71 +13,8 @@
                 "nova_object.name": "ExceptionPayload",
                 "nova_object.namespace": "nova",
                 "nova_object.version": "1.0"
-            },
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "projects": null,
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "node": "fake-mini",
-            "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config": "MANUAL",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name": "InstanceActionVolumePayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.3"
+            }
+        }
     },
     "priority": "ERROR",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_attach-start.json b/doc/notification_samples/instance-volume_attach-start.json
index 54c4ce38ebcc..9fff9d2e56b9 100644
--- a/doc/notification_samples/instance-volume_attach-start.json
+++ b/doc/notification_samples/instance-volume_attach-start.json
@@ -1,90 +1,7 @@
 {
     "event_type": "instance.volume_attach.start",
     "payload": {
-        "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
-            "fault": null,
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "projects": null,
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "node": "fake-mini",
-            "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config": "MANUAL",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name": "InstanceActionVolumePayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.3"
+        "$ref": "common_payloads/InstanceActionVolumePayload.json#"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_detach-end.json b/doc/notification_samples/instance-volume_detach-end.json
index 9cfed36aa9e7..7c8282460a27 100644
--- a/doc/notification_samples/instance-volume_detach-end.json
+++ b/doc/notification_samples/instance-volume_detach-end.json
@@ -1,90 +1,7 @@
 {
     "event_type": "instance.volume_detach.end",
     "payload": {
-        "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
-            "fault": null,
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "projects": null,
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "node": "fake-mini",
-            "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config": "MANUAL",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name": "InstanceActionVolumePayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.3"
+        "$ref": "common_payloads/InstanceActionVolumePayload.json#"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_detach-start.json b/doc/notification_samples/instance-volume_detach-start.json
index fc1814f49d0a..8a46ef36aea8 100644
--- a/doc/notification_samples/instance-volume_detach-start.json
+++ b/doc/notification_samples/instance-volume_detach-start.json
@@ -1,90 +1,7 @@
 {
     "event_type": "instance.volume_detach.start",
     "payload": {
-        "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
-            "fault": null,
-            "flavor": {
-                "nova_object.name": "FlavorPayload",
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "projects": null,
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.version": "1.4",
-                "nova_object.namespace": "nova"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "node": "fake-mini",
-            "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config": "MANUAL",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b",
-            "updated_at": "2012-10-29T13:42:11Z"
-        },
-        "nova_object.name": "InstanceActionVolumePayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.3"
+        "$ref": "common_payloads/InstanceActionVolumePayload.json#"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_swap-end.json b/doc/notification_samples/instance-volume_swap-end.json
index a2b2894528a4..9dc91dcf3e63 100644
--- a/doc/notification_samples/instance-volume_swap-end.json
+++ b/doc/notification_samples/instance-volume_swap-end.json
@@ -1,9 +1,8 @@
 {
     "event_type": "instance.volume_swap.end",
     "payload": {
+        "$ref": "common_payloads/InstanceActionVolumeSwapPayload.json#",
         "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
             "block_devices": [{
                 "nova_object.data": {
                     "boot_index": null,
@@ -15,77 +14,8 @@
                 "nova_object.name": "BlockDevicePayload",
                 "nova_object.namespace": "nova",
                 "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
-            "fault": null,
-            "flavor": {
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.name": "FlavorPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.4"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "new_volume_id": "227cc671-f30b-4488-96fd-7d0bf13648d8",
-            "node": "fake-mini",
-            "old_volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config":"MANUAL",
-            "updated_at": "2012-10-29T13:42:11Z",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b"
-        },
-        "nova_object.name": "InstanceActionVolumeSwapPayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.5"
+            }]
+        }
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_swap-error.json b/doc/notification_samples/instance-volume_swap-error.json
index e00c376e9d1b..f0e3d2c44f0f 100644
--- a/doc/notification_samples/instance-volume_swap-error.json
+++ b/doc/notification_samples/instance-volume_swap-error.json
@@ -1,25 +1,10 @@
 {
     "event_type": "instance.volume_swap.error",
     "payload": {
+        "$ref": "common_payloads/InstanceActionVolumeSwapPayload.json#",
         "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
+            "new_volume_id": "9c6d9c2d-7a8f-4c80-938d-3bf062b8d489",
+            "old_volume_id": "828419fa-3efb-4533-b458-4267ca5fe9b1",
             "fault": {
                 "nova_object.data": {
                     "exception": "TypeError",
@@ -30,72 +15,8 @@
                 "nova_object.name": "ExceptionPayload",
                 "nova_object.namespace": "nova",
                 "nova_object.version": "1.0"
-            },
-            "flavor": {
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.name": "FlavorPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.4"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "new_volume_id": "9c6d9c2d-7a8f-4c80-938d-3bf062b8d489",
-            "node": "fake-mini",
-            "old_volume_id": "828419fa-3efb-4533-b458-4267ca5fe9b1",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config":"MANUAL",
-            "updated_at": "2012-10-29T13:42:11Z",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b"
-        },
-        "nova_object.name": "InstanceActionVolumeSwapPayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.5"
+            }
+        }
     },
     "priority": "ERROR",
     "publisher_id": "nova-compute:compute"
diff --git a/doc/notification_samples/instance-volume_swap-start.json b/doc/notification_samples/instance-volume_swap-start.json
index f2a9271bac38..eee7d175d340 100644
--- a/doc/notification_samples/instance-volume_swap-start.json
+++ b/doc/notification_samples/instance-volume_swap-start.json
@@ -1,91 +1,7 @@
 {
     "event_type": "instance.volume_swap.start",
     "payload": {
-        "nova_object.data": {
-            "architecture": "x86_64",
-            "availability_zone": "nova",
-            "block_devices": [{
-                "nova_object.data": {
-                    "boot_index": null,
-                    "delete_on_termination": false,
-                    "device_name": "/dev/sdb",
-                    "tag": null,
-                    "volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113"
-                },
-                "nova_object.name": "BlockDevicePayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "created_at": "2012-10-29T13:42:11Z",
-            "deleted_at": null,
-            "display_name": "some-server",
-            "display_description":"some-server",
-            "fault": null,
-            "flavor": {
-                "nova_object.data": {
-                    "flavorid": "a22d5517-147c-4147-a0d1-e698df5cd4e3",
-                    "name": "test_flavor",
-                    "root_gb": 1,
-                    "vcpus": 1,
-                    "ephemeral_gb": 0,
-                    "memory_mb": 512,
-                    "disabled": false,
-                    "rxtx_factor": 1.0,
-                    "extra_specs": {
-                        "hw:watchdog_action": "disabled"
-                    },
-                    "projects": null,
-                    "swap": 0,
-                    "is_public": true,
-                    "vcpu_weight": 0,
-                    "description":null
-                },
-                "nova_object.name": "FlavorPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.4"
-            },
-            "host": "compute",
-            "host_name": "some-server",
-            "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
-            "ip_addresses": [{
-                "nova_object.data": {
-                    "address": "192.168.1.3",
-                    "device_name": "tapce531f90-19",
-                    "label": "private-network",
-                    "meta": {},
-                    "port_uuid": "ce531f90-199f-48c0-816c-13e38010b442",
-                    "version": 4,
-                    "mac": "fa:16:3e:4c:2c:30"
-                },
-                "nova_object.name": "IpPayload",
-                "nova_object.namespace": "nova",
-                "nova_object.version": "1.0"
-            }],
-            "key_name": "my-key",
-            "kernel_id": "",
-            "launched_at": "2012-10-29T13:42:11Z",
-            "metadata": {},
-            "locked":false,
-            "new_volume_id": "227cc671-f30b-4488-96fd-7d0bf13648d8",
-            "node": "fake-mini",
-            "old_volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
-            "os_type": null,
-            "power_state":"running",
-            "progress": 0,
-            "ramdisk_id": "",
-            "reservation_id": "r-6w6ruqaz",
-            "state": "active",
-            "task_state": null,
-            "tenant_id": "6f70656e737461636b20342065766572",
-            "terminated_at": null,
-            "auto_disk_config":"MANUAL",
-            "updated_at": "2012-10-29T13:42:11Z",
-            "user_id": "fake",
-            "uuid": "0ab886d0-7443-4107-9265-48371bfa662b"
-        },
-        "nova_object.name": "InstanceActionVolumeSwapPayload",
-        "nova_object.namespace": "nova",
-        "nova_object.version": "1.5"
+        "$ref": "common_payloads/InstanceActionVolumeSwapPayload.json#"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"