diff --git a/src/automation/services/automation.service.ts b/src/automation/services/automation.service.ts
index 9c805f3..91cca1a 100644
--- a/src/automation/services/automation.service.ts
+++ b/src/automation/services/automation.service.ts
@@ -238,6 +238,8 @@ export class AutomationService {
 
           if (device) {
             action.entityId = device.uuid;
+            action.productUuid = device.productDevice.uuid;
+            action.productType = device.productDevice.prodType;
           }
         } else if (
           action.actionExecutor !== ActionExecutorEnum.DEVICE_ISSUE &&
@@ -266,6 +268,8 @@ export class AutomationService {
 
           if (device) {
             condition.entityId = device.uuid;
+            condition.productUuid = device.productDevice.uuid;
+            condition.productType = device.productDevice.prodType;
           }
         }
       }