diff --git a/go.mod b/go.mod
index 36cf94a3..49779ba5 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,8 @@ replace github.com/ThalesIgnite/crypto11 => github.com/aosedge/crypto11 v1.0.3-0
 
 replace github.com/anexia-it/fsquota => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7
 
+replace github.com/aosedge/aos_common => ../aos_common
+
 require (
 	code.cloudfoundry.org/bytefmt v0.0.0-20231017140541-3b893ed0421b
 	github.com/aosedge/aos_common v0.0.0-20240902084419-53e429d5c68a
diff --git a/vendor/github.com/aosedge/aos_common/api/cloudprotocol/unitstatus.go b/vendor/github.com/aosedge/aos_common/api/cloudprotocol/unitstatus.go
index ac7dd55f..3f4df0d1 100644
--- a/vendor/github.com/aosedge/aos_common/api/cloudprotocol/unitstatus.go
+++ b/vendor/github.com/aosedge/aos_common/api/cloudprotocol/unitstatus.go
@@ -161,7 +161,7 @@ type ComponentStatus struct {
 	ComponentID   string          `json:"id"`
 	ComponentType string          `json:"type"`
 	Version       string          `json:"version"`
-	NodeID        string          `json:"nodeId"`
+	NodeID        *string         `json:"nodeId,omitempty"`
 	Status        string          `json:"status"`
 	Annotations   json.RawMessage `json:"annotations,omitempty"`
 	ErrorInfo     *ErrorInfo      `json:"errorInfo,omitempty"`
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4b1517aa..e83c7204 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -7,7 +7,7 @@ github.com/ThalesIgnite/crypto11
 # github.com/anexia-it/fsquota v0.0.0-00010101000000-000000000000 => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7
 ## explicit; go 1.21
 github.com/anexia-it/fsquota
-# github.com/aosedge/aos_common v0.0.0-20240902084419-53e429d5c68a
+# github.com/aosedge/aos_common v0.0.0-20240902084419-53e429d5c68a => ../aos_common
 ## explicit; go 1.21
 github.com/aosedge/aos_common/aoserrors
 github.com/aosedge/aos_common/aostypes
@@ -298,3 +298,4 @@ google.golang.org/protobuf/types/known/timestamppb
 gopkg.in/yaml.v3
 # github.com/ThalesIgnite/crypto11 => github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f
 # github.com/anexia-it/fsquota => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7
+# github.com/aosedge/aos_common => ../aos_common