diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e75748ce..9615e2468 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,8 @@ Thankyou! -->
 * #### Platform Extensions
 
 ### Bugfixes
+    1. Fixed the host profile construction in `patch_state` event class. #1087
+    2. Removed the optional requirement overrides for `name` and `uid` in `_resource` as they are part of a constraint. #1087
 
 ### Deprecated
 
diff --git a/events/discovery/patch_state.json b/events/discovery/patch_state.json
index 4a7c64ccb..25afd9cb9 100644
--- a/events/discovery/patch_state.json
+++ b/events/discovery/patch_state.json
@@ -8,7 +8,11 @@
     "host"
   ],
   "attributes": {
+    "$include": [
+      "profiles/host.json"
+  ],
     "device": {
+      "profile": null,
       "group": "primary",
       "requirement": "required"
     },
diff --git a/objects/_resource.json b/objects/_resource.json
index e361a7b15..4554e035d 100644
--- a/objects/_resource.json
+++ b/objects/_resource.json
@@ -19,16 +19,14 @@
       "requirement": "optional"
     },
     "name": {
-      "description": "The name of the resource.",
-      "requirement": "optional"
+      "description": "The name of the resource."
     },
     "type": {
       "description": "The resource type as defined by the event source.",
       "requirement": "optional"
     },
     "uid": {
-      "description": "The unique identifier of the resource.",
-      "requirement": "optional"
+      "description": "The unique identifier of the resource."
     }
   }
 }