diff --git a/deepfence_server/handler/cloud_node.go b/deepfence_server/handler/cloud_node.go
index 258880da04..663c04423c 100644
--- a/deepfence_server/handler/cloud_node.go
+++ b/deepfence_server/handler/cloud_node.go
@@ -52,15 +52,18 @@ func (h *Handler) RegisterCloudNodeAccountHandler(w http.ResponseWriter, r *http
 		}
 		monitoredAccountIds[req.CloudAccount] = nodeId
 		orgNodeId := fmt.Sprintf("%s-%s-cloud-org", req.CloudProvider, orgAccountId)
+		nodeType := model.PostureProviderGCP
 		orgCloudProvider := model.PostureProviderGCPOrg
 		if req.CloudProvider == model.PostureProviderAWS {
 			orgCloudProvider = model.PostureProviderAWSOrg
+			nodeType = model.PostureProviderAWS
 		}
 		node := map[string]interface{}{
 			"node_id":        orgNodeId,
 			"cloud_provider": orgCloudProvider,
 			"node_name":      orgAccountId,
 			"version":        req.Version,
+			"node_type":      nodeType,
 		}
 		err = model.UpsertCloudComplianceNode(ctx, node, "")
 		if err != nil {
@@ -76,6 +79,7 @@ func (h *Handler) RegisterCloudNodeAccountHandler(w http.ResponseWriter, r *http
 				"node_name":       monitoredAccountId,
 				"organization_id": orgNodeId,
 				"version":         req.Version,
+				"node_type":       nodeType,
 			}
 			err = model.UpsertCloudComplianceNode(ctx, monitoredNode, orgNodeId)
 			if err != nil {
@@ -117,6 +121,7 @@ func (h *Handler) RegisterCloudNodeAccountHandler(w http.ResponseWriter, r *http
 			"cloud_provider": req.CloudProvider,
 			"node_name":      req.CloudAccount,
 			"version":        req.Version,
+			"node_type":      req.CloudProvider,
 		}
 		logrus.Debugf("Node for upsert: %+v", node)
 		err = model.UpsertCloudComplianceNode(ctx, node, "")