diff --git a/chains/ancient8/addresses.yaml b/chains/ancient8/addresses.yaml
index 20d385583..5a799eb89 100644
--- a/chains/ancient8/addresses.yaml
+++ b/chains/ancient8/addresses.yaml
@@ -1,16 +1,16 @@
-staticAggregationHookFactory: "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6"
-staticAggregationIsmFactory: "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A"
+domainRoutingIsmFactory: "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908"
 fallbackRoutingHook: "0x5E01d8F34b629E3f92d69546bbc4142A7Adee7e9"
 interchainGasPaymaster: "0x8F1E22d309baa69D398a03cc88E9b46037e988AA"
 interchainSecurityModule: "0x6E3387e12C6e181BF8e712eCa9c60ccEEaBD1c67"
 mailbox: "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7"
-staticMerkleRootMultisigIsmFactory: "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC"
 merkleTreeHook: "0x811808Dd29ba8B0FC6C0ec0b5537035E59745162"
-staticMessageIdMultisigIsmFactory: "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE"
 pausableHook: "0x66DC49405Ae2956f7E87FEAa9fE8f506C8987462"
 protocolFee: "0xE0C452DDA7506f0F4dE5C8C1d383F7aD866eA4F0"
 proxyAdmin: "0x0761b0827849abbf7b0cC09CE14e1C93D87f5004"
-domainRoutingIsmFactory: "0x1052eF3419f26Bec74Ed7CEf4a4FA6812Bc09908"
+staticAggregationHookFactory: "0xEb9FcFDC9EfDC17c1EC5E1dc085B98485da213D6"
+staticAggregationIsmFactory: "0x8F7454AC98228f3504Bb91eA3D8Adafe6406110A"
+staticMerkleRootMultisigIsmFactory: "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC"
+staticMessageIdMultisigIsmFactory: "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE"
 storageGasOracle: "0x59Bf7c7b458375b1A7c453aE70EaCb376E65CDAF"
 testRecipient: "0x2Fa570E83009eaEef3a1cbd496a9a30F05266634"
 validatorAnnounce: "0x931dFCc8c1141D6F532FD023bd87DAe0080c835d"
diff --git a/chains/ancient8/metadata.yaml b/chains/ancient8/metadata.yaml
index 07cd08ab1..7ecefde51 100644
--- a/chains/ancient8/metadata.yaml
+++ b/chains/ancient8/metadata.yaml
@@ -2,7 +2,7 @@
 blockExplorers:
   - apiUrl: https://scan.ancient8.gg/api
     family: blockscout
-    name: "Ancient8 Explorer"
+    name: Ancient8 Explorer
     url: https://scan.ancient8.gg
 blocks:
   confirmations: 1
diff --git a/chains/holesky/addresses.yaml b/chains/holesky/addresses.yaml
index 4f7266cdf..a6ae8d63a 100644
--- a/chains/holesky/addresses.yaml
+++ b/chains/holesky/addresses.yaml
@@ -1,16 +1,16 @@
-mailbox: "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc"
-proxyAdmin: "0x33dB966328Ea213b0f76eF96CA368AB37779F065"
-validatorAnnounce: "0xAb9B273366D794B7F80B4378bc8Aaca75C6178E2"
-testRecipient: "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD"
-staticMerkleRootMultisigIsmFactory: "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2"
-staticMessageIdMultisigIsmFactory: "0x6966b0E55883d49BFB24539356a2f8A673E02039"
-staticAggregationIsmFactory: "0x54148470292C24345fb828B003461a9444414517"
-staticAggregationHookFactory: "0x589C201a07c26b4725A4A829d772f24423da480B"
 domainRoutingIsmFactory: "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD"
+fallbackRoutingHook: "0x07009DA2249c388aD0f416a235AfE90D784e1aAc"
+interchainGasPaymaster: "0x5CBf4e70448Ed46c2616b04e9ebc72D29FF0cfA9"
 interchainSecurityModule: "0x751f2b684EeBb916dB777767CCb8fd793C8b2956"
+mailbox: "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc"
 merkleTreeHook: "0x98AAE089CaD930C64a76dD2247a2aC5773a4B8cE"
-fallbackRoutingHook: "0x07009DA2249c388aD0f416a235AfE90D784e1aAc"
 pausableHook: "0xF7561c34f17A32D5620583A3397C304e7038a7F6"
-storageGasOracle: "0x2b2a158B4059C840c7aC67399B153bb567D06303"
-interchainGasPaymaster: "0x5CBf4e70448Ed46c2616b04e9ebc72D29FF0cfA9"
 protocolFee: "0x6b1bb4ce664Bb4164AEB4d3D2E7DE7450DD8084C"
+proxyAdmin: "0x33dB966328Ea213b0f76eF96CA368AB37779F065"
+staticAggregationHookFactory: "0x589C201a07c26b4725A4A829d772f24423da480B"
+staticAggregationIsmFactory: "0x54148470292C24345fb828B003461a9444414517"
+staticMerkleRootMultisigIsmFactory: "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2"
+staticMessageIdMultisigIsmFactory: "0x6966b0E55883d49BFB24539356a2f8A673E02039"
+storageGasOracle: "0x2b2a158B4059C840c7aC67399B153bb567D06303"
+testRecipient: "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD"
+validatorAnnounce: "0xAb9B273366D794B7F80B4378bc8Aaca75C6178E2"
diff --git a/chains/holesky/metadata.yaml b/chains/holesky/metadata.yaml
index 98a567e62..2b47e9103 100644
--- a/chains/holesky/metadata.yaml
+++ b/chains/holesky/metadata.yaml
@@ -8,14 +8,14 @@ blocks:
   confirmations: 1
   estimateBlockTime: 13
   reorgPeriod: 2
-name: holesky
 chainId: 17000
-isTestnet: true
 domainId: 17000
-protocol: ethereum
+isTestnet: true
+name: holesky
 nativeToken:
   decimals: 18
   name: Ether
   symbol: ETH
+protocol: ethereum
 rpcUrls:
   - http: https://ethereum-holesky-rpc.publicnode.com
diff --git a/deployments/avs/holesky.yaml b/deployments/avs/holesky.yaml
index 0843e9ada..e3eb01eee 100644
--- a/deployments/avs/holesky.yaml
+++ b/deployments/avs/holesky.yaml
@@ -1,5 +1,5 @@
 contracts:
   avsDirectory: "0x055733000064333CaDDbC92763c58BF0192fFeBf"
-  proxyAdmin: "0x6e7b29cb2a7617405b4d30c6f84bbd51b4bb4be8"
   ecdsaStakeRegistry: "0x275aCcCa81cAD931dC6fB6E49ED233Bc99Bed4A7"
   hyperlaneServiceManager: "0x16B710b86CAd07E6F1C531861a16F5feC29dba37"
+  proxyAdmin: "0x6e7b29cb2a7617405b4d30c6f84bbd51b4bb4be8"
diff --git a/deployments/warp_routes/ECLIP/arbitrum-neutron-addresses.yaml b/deployments/warp_routes/ECLIP/arbitrum-neutron-addresses.yaml
index aeb83175c..117de60b5 100644
--- a/deployments/warp_routes/ECLIP/arbitrum-neutron-addresses.yaml
+++ b/deployments/warp_routes/ECLIP/arbitrum-neutron-addresses.yaml
@@ -1,4 +1,4 @@
-neutron:
-  collateral: neutron1dvzvf870mx9uf65uqhx40yzx9gu4xlqqq2pnx362a0ndmustww3smumrf5
 arbitrum:
   synthetic: "0x93ca0d85837FF83158Cd14D65B169CdB223b1921"
+neutron:
+  collateral: neutron1dvzvf870mx9uf65uqhx40yzx9gu4xlqqq2pnx362a0ndmustww3smumrf5
diff --git a/deployments/warp_routes/ECLIP/arbitrum-neutron-config.yaml b/deployments/warp_routes/ECLIP/arbitrum-neutron-config.yaml
index 66d9b3d70..f3435a177 100644
--- a/deployments/warp_routes/ECLIP/arbitrum-neutron-config.yaml
+++ b/deployments/warp_routes/ECLIP/arbitrum-neutron-config.yaml
@@ -1,21 +1,21 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: neutron
-    standard: CwHypCollateral
-    decimals: 6
-    symbol: ECLIP
-    name: Eclipse Fi
-    addressOrDenom: neutron1dvzvf870mx9uf65uqhx40yzx9gu4xlqqq2pnx362a0ndmustww3smumrf5
+  - addressOrDenom: neutron1dvzvf870mx9uf65uqhx40yzx9gu4xlqqq2pnx362a0ndmustww3smumrf5
+    chainName: neutron
     collateralAddressOrDenom: factory/neutron10sr06r3qkhn7xzpw3339wuj77hu06mzna6uht0/eclip
-    igpTokenAddressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
     connections:
       - token: ethereum|arbitrum|0x93ca0d85837FF83158Cd14D65B169CdB223b1921
-  - chainName: arbitrum
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: ECLIP
+    igpTokenAddressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
     name: Eclipse Fi
-    addressOrDenom: "0x93ca0d85837FF83158Cd14D65B169CdB223b1921"
-    logoURI: /logos/ECLIP.png
+    standard: CwHypCollateral
+    symbol: ECLIP
+  - addressOrDenom: "0x93ca0d85837FF83158Cd14D65B169CdB223b1921"
+    chainName: arbitrum
     connections:
       - token: cosmos|neutron|neutron1dvzvf870mx9uf65uqhx40yzx9gu4xlqqq2pnx362a0ndmustww3smumrf5
+    decimals: 6
+    logoURI: /logos/ECLIP.png
+    name: Eclipse Fi
+    standard: EvmHypSynthetic
+    symbol: ECLIP
diff --git a/deployments/warp_routes/ETH/ethereum-viction-config.yaml b/deployments/warp_routes/ETH/ethereum-viction-config.yaml
index 1c022fbf9..da3be6a9b 100644
--- a/deployments/warp_routes/ETH/ethereum-viction-config.yaml
+++ b/deployments/warp_routes/ETH/ethereum-viction-config.yaml
@@ -1,18 +1,18 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: ethereum
-    standard: EvmHypNative
-    decimals: 18
-    symbol: ETH
-    name: Ethereum
-    addressOrDenom: "0x15b5D6B614242B118AA404528A7f3E2Ad241e4A4"
+  - addressOrDenom: "0x15b5D6B614242B118AA404528A7f3E2Ad241e4A4"
+    chainName: ethereum
     connections:
       - token: ethereum|viction|0x182e8d7c5f1b06201b102123fc7df0eaeb445a7b
-  - chainName: viction
-    standard: EvmHypSynthetic
     decimals: 18
-    symbol: ETH
     name: Ethereum
-    addressOrDenom: "0x182e8d7c5f1b06201b102123fc7df0eaeb445a7b"
+    standard: EvmHypNative
+    symbol: ETH
+  - addressOrDenom: "0x182e8d7c5f1b06201b102123fc7df0eaeb445a7b"
+    chainName: viction
     connections:
       - token: ethereum|ethereum|0x15b5D6B614242B118AA404528A7f3E2Ad241e4A4
+    decimals: 18
+    name: Ethereum
+    standard: EvmHypSynthetic
+    symbol: ETH
diff --git a/deployments/warp_routes/INJ/injective-inevm-addresses.yaml b/deployments/warp_routes/INJ/injective-inevm-addresses.yaml
index 2745f7582..0e18ed99f 100644
--- a/deployments/warp_routes/INJ/injective-inevm-addresses.yaml
+++ b/deployments/warp_routes/INJ/injective-inevm-addresses.yaml
@@ -1,4 +1,4 @@
-injective:
-  native: inj1mv9tjvkaw7x8w8y9vds8pkfq46g2vcfkjehc6k
 inevm:
   native: "0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4"
+injective:
+  native: inj1mv9tjvkaw7x8w8y9vds8pkfq46g2vcfkjehc6k
diff --git a/deployments/warp_routes/INJ/injective-inevm-config.yaml b/deployments/warp_routes/INJ/injective-inevm-config.yaml
index 554658840..c7181648a 100644
--- a/deployments/warp_routes/INJ/injective-inevm-config.yaml
+++ b/deployments/warp_routes/INJ/injective-inevm-config.yaml
@@ -1,29 +1,29 @@
 # yaml-language-server: $schema=../schema.json
+options:
+  interchainFeeConstants:
+    - addressOrDenom: inj
+      amount: "30000000000000000"
+      destination: inevm
+      origin: injective
+  localFeeConstants:
+    - addressOrDenom: inj
+      amount: "1000000000000000"
+      destination: inevm
+      origin: injective
 tokens:
-  - chainName: injective
-    standard: CwHypNative
-    decimals: 18
-    symbol: INJ
-    name: Injective Coin
-    addressOrDenom: inj1mv9tjvkaw7x8w8y9vds8pkfq46g2vcfkjehc6k
+  - addressOrDenom: inj1mv9tjvkaw7x8w8y9vds8pkfq46g2vcfkjehc6k
+    chainName: injective
     connections:
       - token: ethereum|inevm|0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4
-  - chainName: inevm
-    standard: EvmHypNative
     decimals: 18
-    symbol: INJ
     name: Injective Coin
-    addressOrDenom: "0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4"
+    standard: CwHypNative
+    symbol: INJ
+  - addressOrDenom: "0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4"
+    chainName: inevm
     connections:
       - token: cosmos|injective|inj1mv9tjvkaw7x8w8y9vds8pkfq46g2vcfkjehc6k
-options:
-  localFeeConstants:
-    - origin: injective
-      destination: inevm
-      amount: "1000000000000000"
-      addressOrDenom: inj
-  interchainFeeConstants:
-    - origin: injective
-      destination: inevm
-      amount: "30000000000000000"
-      addressOrDenom: inj
+    decimals: 18
+    name: Injective Coin
+    standard: EvmHypNative
+    symbol: INJ
diff --git a/deployments/warp_routes/TIA/arbitrum-neutron-addresses.yaml b/deployments/warp_routes/TIA/arbitrum-neutron-addresses.yaml
index f55827fdf..37d85a008 100644
--- a/deployments/warp_routes/TIA/arbitrum-neutron-addresses.yaml
+++ b/deployments/warp_routes/TIA/arbitrum-neutron-addresses.yaml
@@ -1,4 +1,4 @@
-neutron:
-  collateral: neutron1jyyjd3x0jhgswgm6nnctxvzla8ypx50tew3ayxxwkrjfxhvje6kqzvzudq
 arbitrum:
   synthetic: "0xD56734d7f9979dD94FAE3d67C7e928234e71cD4C"
+neutron:
+  collateral: neutron1jyyjd3x0jhgswgm6nnctxvzla8ypx50tew3ayxxwkrjfxhvje6kqzvzudq
diff --git a/deployments/warp_routes/TIA/arbitrum-neutron-config.yaml b/deployments/warp_routes/TIA/arbitrum-neutron-config.yaml
index 3a3ea2677..a5333d5d3 100644
--- a/deployments/warp_routes/TIA/arbitrum-neutron-config.yaml
+++ b/deployments/warp_routes/TIA/arbitrum-neutron-config.yaml
@@ -1,25 +1,25 @@
 # yaml-language-server: $schema=../schema.json
+options:
+  interchainFeeConstants:
+    - addressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
+      amount: 270000
+      destination: arbitrum
+      origin: neutron
 tokens:
-  - chainName: neutron
-    standard: CwHypCollateral
-    decimals: 6
-    symbol: TIA.n
-    name: TIA.n
-    addressOrDenom: neutron1jyyjd3x0jhgswgm6nnctxvzla8ypx50tew3ayxxwkrjfxhvje6kqzvzudq
+  - addressOrDenom: neutron1jyyjd3x0jhgswgm6nnctxvzla8ypx50tew3ayxxwkrjfxhvje6kqzvzudq
+    chainName: neutron
     collateralAddressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
     connections:
       - token: ethereum|arbitrum|0xD56734d7f9979dD94FAE3d67C7e928234e71cD4C
-  - chainName: arbitrum
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: TIA.n
     name: TIA.n
-    addressOrDenom: "0xD56734d7f9979dD94FAE3d67C7e928234e71cD4C"
+    standard: CwHypCollateral
+    symbol: TIA.n
+  - addressOrDenom: "0xD56734d7f9979dD94FAE3d67C7e928234e71cD4C"
+    chainName: arbitrum
     connections:
       - token: cosmos|neutron|neutron1jyyjd3x0jhgswgm6nnctxvzla8ypx50tew3ayxxwkrjfxhvje6kqzvzudq
-options:
-  interchainFeeConstants:
-    - origin: neutron
-      destination: arbitrum
-      amount: 270000
-      addressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
+    decimals: 6
+    name: TIA.n
+    standard: EvmHypSynthetic
+    symbol: TIA.n
diff --git a/deployments/warp_routes/TIA/manta-neutron-addresses.yaml b/deployments/warp_routes/TIA/manta-neutron-addresses.yaml
index eb12073b7..d58fdaf56 100644
--- a/deployments/warp_routes/TIA/manta-neutron-addresses.yaml
+++ b/deployments/warp_routes/TIA/manta-neutron-addresses.yaml
@@ -1,4 +1,4 @@
-neutron:
-  collateral: neutron1ch7x3xgpnj62weyes8vfada35zff6z59kt2psqhnx9gjnt2ttqdqtva3pa
 mantapacific:
   synthetic: "0x6Fae4D9935E2fcb11fC79a64e917fb2BF14DaFaa"
+neutron:
+  collateral: neutron1ch7x3xgpnj62weyes8vfada35zff6z59kt2psqhnx9gjnt2ttqdqtva3pa
diff --git a/deployments/warp_routes/TIA/manta-neutron-config.yaml b/deployments/warp_routes/TIA/manta-neutron-config.yaml
index a978a5098..818523869 100644
--- a/deployments/warp_routes/TIA/manta-neutron-config.yaml
+++ b/deployments/warp_routes/TIA/manta-neutron-config.yaml
@@ -1,25 +1,25 @@
 # yaml-language-server: $schema=../schema.json
+options:
+  interchainFeeConstants:
+    - addressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
+      amount: 270000
+      destination: mantapacific
+      origin: neutron
 tokens:
-  - chainName: neutron
-    standard: CwHypCollateral
-    decimals: 6
-    symbol: TIA.n
-    name: TIA.n
-    addressOrDenom: neutron1ch7x3xgpnj62weyes8vfada35zff6z59kt2psqhnx9gjnt2ttqdqtva3pa
+  - addressOrDenom: neutron1ch7x3xgpnj62weyes8vfada35zff6z59kt2psqhnx9gjnt2ttqdqtva3pa
+    chainName: neutron
     collateralAddressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
     connections:
       - token: ethereum|mantapacific|0x6Fae4D9935E2fcb11fC79a64e917fb2BF14DaFaa
-  - chainName: mantapacific
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: TIA.n
     name: TIA.n
-    addressOrDenom: "0x6Fae4D9935E2fcb11fC79a64e917fb2BF14DaFaa"
+    standard: CwHypCollateral
+    symbol: TIA.n
+  - addressOrDenom: "0x6Fae4D9935E2fcb11fC79a64e917fb2BF14DaFaa"
+    chainName: mantapacific
     connections:
       - token: cosmos|neutron|neutron1jyyjd3x0jhgswgm6nnctxvzla8ypx50tew3ayxxwkrjfxhvje6kqzvzudq
-options:
-  interchainFeeConstants:
-    - origin: neutron
-      destination: mantapacific
-      amount: 270000
-      addressOrDenom: ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7
+    decimals: 6
+    name: TIA.n
+    standard: EvmHypSynthetic
+    symbol: TIA.n
diff --git a/deployments/warp_routes/USDC/ethereum-ancient8-addresses.yaml b/deployments/warp_routes/USDC/ethereum-ancient8-addresses.yaml
index 64a1d7e8b..84e6fa79b 100644
--- a/deployments/warp_routes/USDC/ethereum-ancient8-addresses.yaml
+++ b/deployments/warp_routes/USDC/ethereum-ancient8-addresses.yaml
@@ -1,4 +1,4 @@
-ethereum:
-  collateral: "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D"
 ancient8:
   synthetic: "0x97423A68BAe94b5De52d767a17aBCc54c157c0E5"
+ethereum:
+  collateral: "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D"
diff --git a/deployments/warp_routes/USDC/ethereum-ancient8-config.yaml b/deployments/warp_routes/USDC/ethereum-ancient8-config.yaml
index 4fcb4160d..9c8eabf73 100644
--- a/deployments/warp_routes/USDC/ethereum-ancient8-config.yaml
+++ b/deployments/warp_routes/USDC/ethereum-ancient8-config.yaml
@@ -1,19 +1,19 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: ethereum
-    standard: EvmHypCollateral
-    decimals: 6
-    symbol: USDC
-    name: USD Coin
-    addressOrDenom: "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D"
+  - addressOrDenom: "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D"
+    chainName: ethereum
     collateralAddressOrDenom: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
     connections:
       - token: ethereum|ancient8|0x97423A68BAe94b5De52d767a17aBCc54c157c0E5
-  - chainName: ancient8
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: USDC
     name: USD Coin
-    addressOrDenom: "0x97423A68BAe94b5De52d767a17aBCc54c157c0E5"
+    standard: EvmHypCollateral
+    symbol: USDC
+  - addressOrDenom: "0x97423A68BAe94b5De52d767a17aBCc54c157c0E5"
+    chainName: ancient8
     connections:
       - token: ethereum|ethereum|0x8b4192B9Ad1fCa440A5808641261e5289e6de95D
+    decimals: 6
+    name: USD Coin
+    standard: EvmHypSynthetic
+    symbol: USDC
diff --git a/deployments/warp_routes/USDC/ethereum-inevm-config.yaml b/deployments/warp_routes/USDC/ethereum-inevm-config.yaml
index 1696d6dde..510cbc736 100644
--- a/deployments/warp_routes/USDC/ethereum-inevm-config.yaml
+++ b/deployments/warp_routes/USDC/ethereum-inevm-config.yaml
@@ -1,19 +1,19 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: ethereum
-    standard: EvmHypCollateral
-    decimals: 6
-    symbol: USDC
-    name: USDC
-    addressOrDenom: "0xED56728fb977b0bBdacf65bCdD5e17Bb7e84504f"
+  - addressOrDenom: "0xED56728fb977b0bBdacf65bCdD5e17Bb7e84504f"
+    chainName: ethereum
     collateralAddressOrDenom: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
     connections:
       - token: ethereum|inevm|0x8358d8291e3bedb04804975eea0fe9fe0fafb147
-  - chainName: inevm
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: USDC
     name: USDC
-    addressOrDenom: "0x8358d8291e3bedb04804975eea0fe9fe0fafb147"
+    standard: EvmHypCollateral
+    symbol: USDC
+  - addressOrDenom: "0x8358d8291e3bedb04804975eea0fe9fe0fafb147"
+    chainName: inevm
     connections:
       - token: ethereum|ethereum|0xED56728fb977b0bBdacf65bCdD5e17Bb7e84504f
+    decimals: 6
+    name: USDC
+    standard: EvmHypSynthetic
+    symbol: USDC
diff --git a/deployments/warp_routes/USDC/ethereum-viction-config.yaml b/deployments/warp_routes/USDC/ethereum-viction-config.yaml
index 4e9de502e..c1808ca40 100644
--- a/deployments/warp_routes/USDC/ethereum-viction-config.yaml
+++ b/deployments/warp_routes/USDC/ethereum-viction-config.yaml
@@ -1,19 +1,19 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: ethereum
-    standard: EvmHypCollateral
-    decimals: 6
-    symbol: USDC
-    name: USDC
-    addressOrDenom: "0x31Dca7762930f56D81292f85E65c9D67575804fE"
+  - addressOrDenom: "0x31Dca7762930f56D81292f85E65c9D67575804fE"
+    chainName: ethereum
     collateralAddressOrDenom: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
     connections:
       - token: ethereum|viction|0xbda330ea8f3005c421c8088e638fbb64fa71b9e0
-  - chainName: viction
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: USDC
     name: USDC
-    addressOrDenom: "0xbda330ea8f3005c421c8088e638fbb64fa71b9e0"
+    standard: EvmHypCollateral
+    symbol: USDC
+  - addressOrDenom: "0xbda330ea8f3005c421c8088e638fbb64fa71b9e0"
+    chainName: viction
     connections:
       - token: ethereum|ethereum|0x31Dca7762930f56D81292f85E65c9D67575804fE
+    decimals: 6
+    name: USDC
+    standard: EvmHypSynthetic
+    symbol: USDC
diff --git a/deployments/warp_routes/USDT/ethereum-inevm-config.yaml b/deployments/warp_routes/USDT/ethereum-inevm-config.yaml
index ee05e10d5..ef18864b3 100644
--- a/deployments/warp_routes/USDT/ethereum-inevm-config.yaml
+++ b/deployments/warp_routes/USDT/ethereum-inevm-config.yaml
@@ -1,19 +1,19 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: ethereum
-    standard: EvmHypCollateral
-    decimals: 6
-    symbol: USDT
-    name: USDT
-    addressOrDenom: "0xab852e67bf03E74C89aF67C4BA97dd1088D3dA19"
+  - addressOrDenom: "0xab852e67bf03E74C89aF67C4BA97dd1088D3dA19"
+    chainName: ethereum
     collateralAddressOrDenom: "0xdAC17F958D2ee523a2206206994597C13D831ec7"
     connections:
       - token: ethereum|inevm|0x97423a68bae94b5de52d767a17abcc54c157c0e5
-  - chainName: inevm
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: USDT
     name: USDT
-    addressOrDenom: "0x97423a68bae94b5de52d767a17abcc54c157c0e5"
+    standard: EvmHypCollateral
+    symbol: USDT
+  - addressOrDenom: "0x97423a68bae94b5de52d767a17abcc54c157c0e5"
+    chainName: inevm
     connections:
       - token: ethereum|ethereum|0xab852e67bf03E74C89aF67C4BA97dd1088D3dA19
+    decimals: 6
+    name: USDT
+    standard: EvmHypSynthetic
+    symbol: USDT
diff --git a/deployments/warp_routes/USDT/ethereum-viction-config.yaml b/deployments/warp_routes/USDT/ethereum-viction-config.yaml
index c999d6ff1..3ea3adc0e 100644
--- a/deployments/warp_routes/USDT/ethereum-viction-config.yaml
+++ b/deployments/warp_routes/USDT/ethereum-viction-config.yaml
@@ -1,19 +1,19 @@
 # yaml-language-server: $schema=../schema.json
 tokens:
-  - chainName: ethereum
-    standard: EvmHypCollateral
-    decimals: 6
-    symbol: USDT
-    name: USDT
-    addressOrDenom: "0x4221a16A01F61c2b38A03C52d828a7041f6AAA49"
+  - addressOrDenom: "0x4221a16A01F61c2b38A03C52d828a7041f6AAA49"
+    chainName: ethereum
     collateralAddressOrDenom: "0xdAC17F958D2ee523a2206206994597C13D831ec7"
     connections:
       - token: ethereum|viction|0x48083c69f5a42c6b69abbad48ae195bd36770ee2
-  - chainName: viction
-    standard: EvmHypSynthetic
     decimals: 6
-    symbol: USDT
     name: USDT
-    addressOrDenom: "0x48083c69f5a42c6b69abbad48ae195bd36770ee2"
+    standard: EvmHypCollateral
+    symbol: USDT
+  - addressOrDenom: "0x48083c69f5a42c6b69abbad48ae195bd36770ee2"
+    chainName: viction
     connections:
       - token: ethereum|ethereum|0x4221a16A01F61c2b38A03C52d828a7041f6AAA49
+    decimals: 6
+    name: USDT
+    standard: EvmHypSynthetic
+    symbol: USDT
diff --git a/eslint.config.js b/eslint.config.js
index 9d434249a..40e4aa029 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,38 +1,54 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 import tsparser from '@typescript-eslint/parser';
+import eslintPluginYml from 'eslint-plugin-yml';
+import yamlParser from 'yaml-eslint-parser';
 
-export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended, {
-  files: ['src/**/*.ts'],
-  languageOptions: {
-    parser: tsparser,
-    parserOptions: {
-      ecmaVersion: 2022,
-      sourceType: 'module',
-      project: './tsconfig.json',
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    files: ['src/**/*.ts'],
+    languageOptions: {
+      parser: tsparser,
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: 'module',
+        project: './tsconfig.json',
+      },
+    },
+    rules: {
+      'no-console': ['error'],
+      'no-eval': ['error'],
+      'no-extra-boolean-cast': ['error'],
+      'no-ex-assign': ['error'],
+      'no-constant-condition': ['off'],
+      'guard-for-in': ['error'],
+      '@typescript-eslint/ban-ts-comment': ['off'],
+      '@typescript-eslint/explicit-module-boundary-types': ['off'],
+      '@typescript-eslint/no-explicit-any': ['off'],
+      '@typescript-eslint/no-floating-promises': ['error'],
+      '@typescript-eslint/no-non-null-assertion': ['off'],
+      '@typescript-eslint/no-require-imports': ['warn'],
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
     },
+    ignores: ['node_modules', 'dist', 'tmp'],
   },
-  rules: {
-    'no-console': ['error'],
-    'no-eval': ['error'],
-    'no-extra-boolean-cast': ['error'],
-    'no-ex-assign': ['error'],
-    'no-constant-condition': ['off'],
-    'guard-for-in': ['error'],
-    '@typescript-eslint/ban-ts-comment': ['off'],
-    '@typescript-eslint/explicit-module-boundary-types': ['off'],
-    '@typescript-eslint/no-explicit-any': ['off'],
-    '@typescript-eslint/no-floating-promises': ['error'],
-    '@typescript-eslint/no-non-null-assertion': ['off'],
-    '@typescript-eslint/no-require-imports': ['warn'],
-    '@typescript-eslint/no-unused-vars': [
-      'error',
-      {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_',
-        caughtErrorsIgnorePattern: '^_',
-      },
-    ],
+  ...eslintPluginYml.configs['flat/standard'],
+  {
+    files: ['chains/**/*.yaml', 'deployments/**/*.yaml'],
+    languageOptions: {
+      parser: yamlParser,
+    },
+    rules: {
+      'yml/sort-keys': ['error'],
+    },
   },
-  ignores: ['node_modules', 'dist', 'tmp'],
-});
+);
diff --git a/package.json b/package.json
index 2ef5cd001..bc4f51f2c 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "chai": "^4.3.6",
     "eslint": "^9.0.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-yml": "^1.14.0",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "mocha": "^10.2.0",
@@ -57,14 +58,15 @@
   ],
   "license": "MIT",
   "scripts": {
-    "clean": "rm -rf ./dist ./tmp",
     "build": "tsx ./scripts/build.ts && tsc --project tsconfig.publish.json",
-    "lint": "eslint ./src/",
+    "clean": "rm -rf ./dist ./tmp",
+    "lint": "eslint ./src/ ./chains ./deployments",
+    "lint:fix": "yarn lint --fix",
     "prettier": "prettier --write ./chains ./deployments",
-    "test:unit": "yarn build && mocha --config .mocharc.json './test/unit/*.test.ts' --exit",
-    "test:health": "yarn build && mocha --config .mocharc.json './test/health/*.test.ts' --exit",
     "prepare": "husky",
     "release": "yarn build && yarn changeset publish",
+    "test:unit": "yarn build && mocha --config .mocharc.json './test/unit/*.test.ts' --exit",
+    "test:health": "yarn build && mocha --config .mocharc.json './test/health/*.test.ts' --exit",
     "version:prepare": "yarn changeset version && yarn install --no-immutable",
     "version:check": "yarn changeset status"
   },
diff --git a/yarn.lock b/yarn.lock
index ccfecdf39..7edf12e0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1203,6 +1203,7 @@ __metadata:
     chai: "npm:^4.3.6"
     eslint: "npm:^9.0.0"
     eslint-config-prettier: "npm:^9.1.0"
+    eslint-plugin-yml: "npm:^1.14.0"
     husky: "npm:^9.0.11"
     lint-staged: "npm:^15.2.2"
     mocha: "npm:^10.2.0"
@@ -3927,6 +3928,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-compat-utils@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "eslint-compat-utils@npm:0.5.0"
+  dependencies:
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    eslint: ">=6.0.0"
+  checksum: 3f305ca4d9af42ff536cb9abedd4fddecb36809ee04772d5f16c5e4437b169fcfa02c5e6a1554df092dceb67864d0d4516d2db4b3a91131bb8dbbafe00d7b209
+  languageName: node
+  linkType: hard
+
 "eslint-config-prettier@npm:^9.1.0":
   version: 9.1.0
   resolution: "eslint-config-prettier@npm:9.1.0"
@@ -3938,6 +3950,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-yml@npm:^1.14.0":
+  version: 1.14.0
+  resolution: "eslint-plugin-yml@npm:1.14.0"
+  dependencies:
+    debug: "npm:^4.3.2"
+    eslint-compat-utils: "npm:^0.5.0"
+    lodash: "npm:^4.17.21"
+    natural-compare: "npm:^1.4.0"
+    yaml-eslint-parser: "npm:^1.2.1"
+  peerDependencies:
+    eslint: ">=6.0.0"
+  checksum: 11611f94aced40d688f1d7c28d378e713149f0fa0711a6459865f37f994fb47395a94c4c27241e8749e9746b34d6a869aa3074793a5d3b5c4fe499a3946abbfe
+  languageName: node
+  linkType: hard
+
 "eslint-scope@npm:^8.0.1":
   version: 8.0.1
   resolution: "eslint-scope@npm:8.0.1"
@@ -3948,7 +3975,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.3":
+"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.3":
   version: 3.4.3
   resolution: "eslint-visitor-keys@npm:3.4.3"
   checksum: 3f357c554a9ea794b094a09bd4187e5eacd1bc0d0653c3adeb87962c548e6a1ab8f982b86963ae1337f5d976004146536dcee5d0e2806665b193fbfbf1a9231b
@@ -5980,6 +6007,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash@npm:^4.17.21":
+  version: 4.17.21
+  resolution: "lodash@npm:4.17.21"
+  checksum: c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
+  languageName: node
+  linkType: hard
+
 "log-symbols@npm:4.1.0":
   version: 4.1.0
   resolution: "log-symbols@npm:4.1.0"
@@ -9463,6 +9497,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml-eslint-parser@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "yaml-eslint-parser@npm:1.2.2"
+  dependencies:
+    eslint-visitor-keys: "npm:^3.0.0"
+    lodash: "npm:^4.17.21"
+    yaml: "npm:^2.0.0"
+  checksum: 286de5b26011ff828d726189a38b8cd942a97f3ea5f777a6c87294906c580c438079ce393566d4f490201c5cfd274aef0f878d30f83c8e929d768aa1c47fde66
+  languageName: node
+  linkType: hard
+
 "yaml@npm:2.3.4":
   version: 2.3.4
   resolution: "yaml@npm:2.3.4"
@@ -9479,7 +9524,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.4.1":
+"yaml@npm:^2.0.0, yaml@npm:^2.4.1":
   version: 2.4.2
   resolution: "yaml@npm:2.4.2"
   bin: