diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index 64b1f8c12b..86f6b2b023 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -565,6 +565,7 @@ public abstract class BaseController {
         }
         if (e == null) {
             pushEntityActionToRuleEngine(entityId, entity, user, customerId, actionType, additionalInfo);
+            // TODO: voba - refactor to push events to edge queue directly, instead of the rule engine flow
         }
         auditLogService.logEntityAction(user.getTenantId(), customerId, user.getId(), user.getName(), entityId, entity, actionType, e, additionalInfo);
     }
@@ -611,6 +612,10 @@ public abstract class BaseController {
             case UNASSIGNED_FROM_EDGE:
                 msgType = DataConstants.ENTITY_UNASSIGNED_FROM_EDGE;
                 break;
+            case CREDENTIALS_UPDATED:
+                //TODO: voba - this is not efficient way to do this. Refactor on later stages
+                msgType = DataConstants.ENTITY_UPDATED;
+                break;
         }
         if (!StringUtils.isEmpty(msgType)) {
             try {
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
index ff4835d609..dce2be491d 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
@@ -16,8 +16,11 @@
 package org.thingsboard.server.service.edge.rpc.constructor;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
 import org.thingsboard.server.gen.edge.UpdateMsgType;
 
@@ -25,11 +28,21 @@ import org.thingsboard.server.gen.edge.UpdateMsgType;
 @Slf4j
 public class DeviceUpdateMsgConstructor {
 
+    @Autowired
+    private DeviceCredentialsService deviceCredentialsService;
+
     public DeviceUpdateMsg constructDeviceUpdatedMsg(UpdateMsgType msgType, Device device) {
+        DeviceCredentials deviceCredentials
+                = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), device.getId());
         DeviceUpdateMsg.Builder builder = DeviceUpdateMsg.newBuilder()
                 .setMsgType(msgType)
                 .setName(device.getName())
-                .setType(device.getType());
+                .setType(device.getType())
+                .setCredentialsType(deviceCredentials.getCredentialsType().name())
+                .setCredentialsId(deviceCredentials.getCredentialsId());
+        if (deviceCredentials.getCredentialsValue() != null) {
+            builder.setCredentialsValue(deviceCredentials.getCredentialsValue());
+        }
         return builder.build();
     }
 }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
index 7db5a08c1f..29e317fe59 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
@@ -15,12 +15,10 @@
  */
 package org.thingsboard.server.dao.edge;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.Event;
-import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeSearchQuery;
 import org.thingsboard.server.common.data.id.CustomerId;
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 732005efa4..f7f5c3c064 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -160,6 +160,9 @@ message DeviceUpdateMsg {
   UpdateMsgType msgType = 1;
   string name = 2;
   string type = 3;
+  string credentialsType = 4;
+  string credentialsId = 5;
+  string credentialsValue = 6;
 }
 
 message AssetUpdateMsg {