diff --git a/jsonschemas/publications/3d/3.0.0.json b/jsonschemas/publications/3d/3.0.0.json
index 4fd9fd6..21346f5 100644
--- a/jsonschemas/publications/3d/3.0.0.json
+++ b/jsonschemas/publications/3d/3.0.0.json
@@ -388,8 +388,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -495,6 +494,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1040,7 +1043,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/article/3.0.0.json b/jsonschemas/publications/article/3.0.0.json
index 6d519d2..c22fe2a 100644
--- a/jsonschemas/publications/article/3.0.0.json
+++ b/jsonschemas/publications/article/3.0.0.json
@@ -347,8 +347,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -454,6 +453,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -999,7 +1002,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/audio/3.0.0.json b/jsonschemas/publications/audio/3.0.0.json
index 7f00011..b3ddd5e 100644
--- a/jsonschemas/publications/audio/3.0.0.json
+++ b/jsonschemas/publications/audio/3.0.0.json
@@ -349,8 +349,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -456,6 +455,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1001,7 +1004,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/checking-in/3.0.0.json b/jsonschemas/publications/checking-in/3.0.0.json
index 36cef83..7acadd3 100644
--- a/jsonschemas/publications/checking-in/3.0.0.json
+++ b/jsonschemas/publications/checking-in/3.0.0.json
@@ -370,8 +370,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -477,6 +476,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1022,7 +1025,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/embed/3.0.0.json b/jsonschemas/publications/embed/3.0.0.json
index 5607793..edca0d3 100644
--- a/jsonschemas/publications/embed/3.0.0.json
+++ b/jsonschemas/publications/embed/3.0.0.json
@@ -345,8 +345,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -452,6 +451,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -997,7 +1000,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/event/3.0.0.json b/jsonschemas/publications/event/3.0.0.json
index 1df845f..67a42b2 100644
--- a/jsonschemas/publications/event/3.0.0.json
+++ b/jsonschemas/publications/event/3.0.0.json
@@ -869,8 +869,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -976,6 +975,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1521,7 +1524,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/image/3.0.0.json b/jsonschemas/publications/image/3.0.0.json
index 342dfe3..faf98e9 100644
--- a/jsonschemas/publications/image/3.0.0.json
+++ b/jsonschemas/publications/image/3.0.0.json
@@ -349,8 +349,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -456,6 +455,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1001,7 +1004,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/link/3.0.0.json b/jsonschemas/publications/link/3.0.0.json
index 4cfc242..114f856 100644
--- a/jsonschemas/publications/link/3.0.0.json
+++ b/jsonschemas/publications/link/3.0.0.json
@@ -345,8 +345,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -452,6 +451,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -997,7 +1000,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/livestream/3.0.0.json b/jsonschemas/publications/livestream/3.0.0.json
index f4db68c..5887ff5 100644
--- a/jsonschemas/publications/livestream/3.0.0.json
+++ b/jsonschemas/publications/livestream/3.0.0.json
@@ -386,8 +386,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -493,6 +492,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1038,7 +1041,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/mint/3.0.0.json b/jsonschemas/publications/mint/3.0.0.json
index e5bc27e..e98caf5 100644
--- a/jsonschemas/publications/mint/3.0.0.json
+++ b/jsonschemas/publications/mint/3.0.0.json
@@ -345,8 +345,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -452,6 +451,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -997,7 +1000,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/space/3.0.0.json b/jsonschemas/publications/space/3.0.0.json
index d6d40e8..f849b37 100644
--- a/jsonschemas/publications/space/3.0.0.json
+++ b/jsonschemas/publications/space/3.0.0.json
@@ -365,8 +365,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -472,6 +471,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1017,7 +1020,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/story/3.0.0.json b/jsonschemas/publications/story/3.0.0.json
index f3d3e34..e7d0b3e 100644
--- a/jsonschemas/publications/story/3.0.0.json
+++ b/jsonschemas/publications/story/3.0.0.json
@@ -337,8 +337,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -444,6 +443,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -989,7 +992,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/text-only/3.0.0.json b/jsonschemas/publications/text-only/3.0.0.json
index 247f26f..df0dbe3 100644
--- a/jsonschemas/publications/text-only/3.0.0.json
+++ b/jsonschemas/publications/text-only/3.0.0.json
@@ -334,8 +334,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -441,6 +440,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -986,7 +989,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/transaction/3.0.0.json b/jsonschemas/publications/transaction/3.0.0.json
index ea93869..bc87f18 100644
--- a/jsonschemas/publications/transaction/3.0.0.json
+++ b/jsonschemas/publications/transaction/3.0.0.json
@@ -188,7 +188,7 @@
           "description": "The type of transaction."
         },
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId",
+          "$ref": "#/$defs/ChainId",
           "description": "The Chain Id."
         },
         "content": {
@@ -369,8 +369,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -476,6 +475,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1021,7 +1024,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/jsonschemas/publications/video/3.0.0.json b/jsonschemas/publications/video/3.0.0.json
index 060a3a8..84e212c 100644
--- a/jsonschemas/publications/video/3.0.0.json
+++ b/jsonschemas/publications/video/3.0.0.json
@@ -352,8 +352,7 @@
           "type": "object",
           "properties": {
             "chainId": {
-              "type": "number",
-              "exclusiveMinimum": 0
+              "$ref": "#/$defs/ChainId"
             },
             "address": {
               "$ref": "#/$defs/EvmAddress"
@@ -459,6 +458,10 @@
         }
       ]
     },
+    "ChainId": {
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
     "CollectCondition": {
       "type": "object",
       "properties": {
@@ -1004,7 +1007,7 @@
       "type": "object",
       "properties": {
         "chainId": {
-          "$ref": "#/$defs/AdvancedContractCondition/properties/contract/properties/chainId"
+          "$ref": "#/$defs/ChainId"
         },
         "address": {
           "$ref": "#/$defs/EvmAddress"
diff --git a/scripts/build.ts b/scripts/build.ts
index e566fee..0cc78e5 100755
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -51,6 +51,7 @@ import {
   EncryptedStringSchema,
   MediaAttributesSchema,
   EncryptableUriSchema,
+  ChainIdSchema,
 } from '../src';
 import { ModuleMetadataSchema } from '../src/module';
 
@@ -90,6 +91,7 @@ for (const [path, Schema] of schemas) {
       AdvancedContractCondition: AdvancedContractConditionSchema,
       Amount: AmountSchema,
       AnyMedia: AnyMediaSchema,
+      ChainId: ChainIdSchema,
       CollectCondition: CollectConditionSchema,
       EncryptableUri: EncryptableUriSchema,
       EncryptedString: EncryptedStringSchema,