diff --git a/doc/notification_samples/common_payloads/ServiceStatusPayload.json b/doc/notification_samples/common_payloads/ServiceStatusPayload.json
deleted file mode 100644
index 3a8d0c4f3f..0000000000
--- a/doc/notification_samples/common_payloads/ServiceStatusPayload.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "nova_object.name": "ServiceStatusPayload",
-    "nova_object.namespace": "nova",
-    "nova_object.version": "1.1",
-    "nova_object.data": {
-        "host": "host2",
-        "disabled": false,
-        "binary": "nova-compute",
-        "topic": "compute",
-        "disabled_reason": null,
-        "forced_down": false,
-        "version": 23,
-        "availability_zone": null,
-        "uuid": "fa69c544-906b-4a6a-a9c6-c1f7a8078c73",
-        "last_seen_up": null,
-        "report_count": 0
-    }
-}
diff --git a/doc/notification_samples/service-create.json b/doc/notification_samples/service-create.json
index 1145647f87..3855b1e5a1 100644
--- a/doc/notification_samples/service-create.json
+++ b/doc/notification_samples/service-create.json
@@ -1,7 +1,22 @@
 {
     "priority": "INFO",
     "payload": {
-        "$ref": "common_payloads/ServiceStatusPayload.json#"
+        "nova_object.namespace": "nova",
+        "nova_object.name": "ServiceStatusPayload",
+        "nova_object.version": "1.1",
+        "nova_object.data": {
+            "host": "host2",
+            "disabled": false,
+            "last_seen_up": null,
+            "binary": "nova-compute",
+            "topic": "compute",
+            "disabled_reason": null,
+            "report_count": 0,
+            "forced_down": false,
+            "version": 23,
+            "availability_zone": null,
+            "uuid": "fa69c544-906b-4a6a-a9c6-c1f7a8078c73"
+        }
     },
     "event_type": "service.create",
     "publisher_id": "nova-compute:host2"
diff --git a/doc/notification_samples/service-delete.json b/doc/notification_samples/service-delete.json
index eb37ab54ce..02d2623d5c 100644
--- a/doc/notification_samples/service-delete.json
+++ b/doc/notification_samples/service-delete.json
@@ -1,7 +1,22 @@
 {
     "priority": "INFO",
     "payload": {
-        "$ref": "common_payloads/ServiceStatusPayload.json#"
+        "nova_object.namespace": "nova",
+        "nova_object.name": "ServiceStatusPayload",
+        "nova_object.version": "1.1",
+        "nova_object.data": {
+            "host": "host2",
+            "disabled": false,
+            "last_seen_up": null,
+            "binary": "nova-compute",
+            "topic": "compute",
+            "disabled_reason": null,
+            "report_count": 0,
+            "forced_down": false,
+            "version": 23,
+            "availability_zone": null,
+            "uuid": "32887c0a-5063-4d39-826f-4903c241c376"
+        }
     },
     "event_type": "service.delete",
     "publisher_id": "nova-compute:host2"
diff --git a/doc/notification_samples/service-update.json b/doc/notification_samples/service-update.json
index 28f5f8697b..dedb9389f4 100644
--- a/doc/notification_samples/service-update.json
+++ b/doc/notification_samples/service-update.json
@@ -1,10 +1,21 @@
 {
     "priority": "INFO",
     "payload": {
-        "$ref": "common_payloads/ServiceStatusPayload.json#",
+        "nova_object.namespace": "nova",
+        "nova_object.name": "ServiceStatusPayload",
+        "nova_object.version": "1.1",
         "nova_object.data": {
+            "host": "host1",
+            "disabled": false,
             "last_seen_up": "2012-10-29T13:42:05Z",
-            "report_count": 1
+            "binary": "nova-compute",
+            "topic": "compute",
+            "disabled_reason": null,
+            "report_count": 1,
+            "forced_down": false,
+            "version": 23,
+            "availability_zone": null,
+            "uuid": "fa69c544-906b-4a6a-a9c6-c1f7a8078c73"
         }
     },
     "event_type": "service.update",