diff --git a/server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/ConditionTaskDispatcherDefinitionFactory.java b/server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/ConditionTaskDispatcherDefinitionFactory.java
index 72154e4024..299bb36a47 100644
--- a/server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/ConditionTaskDispatcherDefinitionFactory.java
+++ b/server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/ConditionTaskDispatcherDefinitionFactory.java
@@ -73,7 +73,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                         .placeholder("Add AND Condition")
                         .expressionEnabled(false)
                         .items(
-                            object()
+                            object("boolean")
                                 .label("Boolean Expression")
                                 .expressionEnabled(false)
                                 .properties(
@@ -98,7 +98,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                                         .description(
                                             "The boolean value to compare with the first one.")
                                         .defaultValue(false)),
-                            object()
+                            object("dateTime")
                                 .label("Date & Time Expression")
                                 .expressionEnabled(false)
                                 .properties(
@@ -123,7 +123,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                                         .description(
                                             "The date & time value to compare with the first one.")
                                         .defaultValue(null)),
-                            object()
+                            object("number")
                                 .label("Number Expression")
                                 .expressionEnabled(false)
                                 .properties(
@@ -159,7 +159,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                                         .defaultValue(0)
                                         .displayCondition(
                                             "%s != '%s'".formatted(OPERATION, Operation.EMPTY.name()))),
-                            object()
+                            object("string")
                                 .label("String Expression")
                                 .expressionEnabled(false)
                                 .properties(
diff --git a/server/libs/modules/task-dispatchers/condition/src/test/resources/definition/condition_v1.json b/server/libs/modules/task-dispatchers/condition/src/test/resources/definition/condition_v1.json
index a90556d898..28fdc4907a 100644
--- a/server/libs/modules/task-dispatchers/condition/src/test/resources/definition/condition_v1.json
+++ b/server/libs/modules/task-dispatchers/condition/src/test/resources/definition/condition_v1.json
@@ -63,7 +63,7 @@
         "hidden" : null,
         "metadata" : { },
         "required" : null,
-        "name" : null,
+        "name" : "boolean",
         "type" : "OBJECT",
         "defaultValue" : null,
         "description" : null,
@@ -174,7 +174,7 @@
         "hidden" : null,
         "metadata" : { },
         "required" : null,
-        "name" : null,
+        "name" : "dateTime",
         "type" : "OBJECT",
         "defaultValue" : null,
         "description" : null,
@@ -269,7 +269,7 @@
         "hidden" : null,
         "metadata" : { },
         "required" : null,
-        "name" : null,
+        "name" : "number",
         "type" : "OBJECT",
         "defaultValue" : null,
         "description" : null,
@@ -394,7 +394,7 @@
         "hidden" : null,
         "metadata" : { },
         "required" : null,
-        "name" : null,
+        "name" : "string",
         "type" : "OBJECT",
         "defaultValue" : null,
         "description" : null,