diff --git a/.changeset/brown-queens-whisper.md b/.changeset/brown-queens-whisper.md
new file mode 100644
index 00000000..41068080
--- /dev/null
+++ b/.changeset/brown-queens-whisper.md
@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/registry': patch
+---
+
+Update configs according to https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/5316, which moves ownerOverride to its own proxyAdmin. Reverts removal of ownerOverride for some routes.
diff --git a/deployments/warp_routes/AMPHRETH/arbitrum-ethereum-zircuit-deploy.yaml b/deployments/warp_routes/AMPHRETH/arbitrum-ethereum-zircuit-deploy.yaml
index 9fd724c6..553c892b 100644
--- a/deployments/warp_routes/AMPHRETH/arbitrum-ethereum-zircuit-deploy.yaml
+++ b/deployments/warp_routes/AMPHRETH/arbitrum-ethereum-zircuit-deploy.yaml
@@ -2,21 +2,21 @@ arbitrum:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0x979Ca5202784112f4738403dBec5D0F3B9daabB9"
   owner: "0x008615770B588633265cB01Abd19740fAe67d0B9"
-  ownerOverrides:
-    proxyAdmin: "0x008615770B588633265cB01Abd19740fAe67d0B9"
+  proxyAdmin:
+    owner: "0x008615770B588633265cB01Abd19740fAe67d0B9"
   type: synthetic
 ethereum:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xc005dc82818d67AF737725bD4bf75435d065D239"
   owner: "0x008615770B588633265cB01Abd19740fAe67d0B9"
-  ownerOverrides:
-    proxyAdmin: "0x008615770B588633265cB01Abd19740fAe67d0B9"
+  proxyAdmin:
+    owner: "0x008615770B588633265cB01Abd19740fAe67d0B9"
   token: "0x5fD13359Ba15A84B76f7F87568309040176167cd"
   type: collateral
 zircuit:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xc2FbB9411186AB3b1a6AFCCA702D1a80B48b197c"
   owner: "0xD0673e7F3FB4037CA79F53d2d311D0e017d39963"
-  ownerOverrides:
-    proxyAdmin: "0xD0673e7F3FB4037CA79F53d2d311D0e017d39963"
+  proxyAdmin:
+    owner: "0xD0673e7F3FB4037CA79F53d2d311D0e017d39963"
   type: synthetic
diff --git a/deployments/warp_routes/CBBTC/base-zeronetwork-deploy.yaml b/deployments/warp_routes/CBBTC/base-zeronetwork-deploy.yaml
index 306ecedb..e86fa6ce 100644
--- a/deployments/warp_routes/CBBTC/base-zeronetwork-deploy.yaml
+++ b/deployments/warp_routes/CBBTC/base-zeronetwork-deploy.yaml
@@ -2,16 +2,40 @@ base:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xeA87ae93Fa0019a82A727bfd3eBd1cFCa8f64f1D"
   owner: "0x3949eD0CD036D9FF662d97BD7aC1686051c4aeBF"
+  ownerOverrides:
+    _safeAddress: "0x3949eD0CD036D9FF662d97BD7aC1686051c4aeBF"
+    fallbackRoutingHook: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+    proxyAdmin: "0x3949eD0CD036D9FF662d97BD7aC1686051c4aeBF"
+    testRecipient: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+    validatorAnnounce: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
   proxyAdmin:
     address: "0x0FC41a92F526A8CD22060A4052e156502D6B9db0"
     owner: "0x3949eD0CD036D9FF662d97BD7aC1686051c4aeBF"
+    ownerOverrides:
+      _safeAddress: "0x3949eD0CD036D9FF662d97BD7aC1686051c4aeBF"
+      fallbackRoutingHook: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+      proxyAdmin: "0x3949eD0CD036D9FF662d97BD7aC1686051c4aeBF"
+      testRecipient: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+      validatorAnnounce: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
   token: "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf"
   type: collateral
 zeronetwork:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xd7b351D2dE3495eA259DD10ab4b9300A378Afbf3"
   owner: "0xCB21F61A3c8139F18e635d45aD1e62A4A61d2c3D"
+  ownerOverrides:
+    _safeAddress: "0xCB21F61A3c8139F18e635d45aD1e62A4A61d2c3D"
+    fallbackRoutingHook: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+    proxyAdmin: "0xCB21F61A3c8139F18e635d45aD1e62A4A61d2c3D"
+    testRecipient: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+    validatorAnnounce: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
   proxyAdmin:
     address: "0xDb0F69187750b52A637938Ea790fAE667123367c"
     owner: "0xCB21F61A3c8139F18e635d45aD1e62A4A61d2c3D"
+    ownerOverrides:
+      _safeAddress: "0xCB21F61A3c8139F18e635d45aD1e62A4A61d2c3D"
+      fallbackRoutingHook: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+      proxyAdmin: "0xCB21F61A3c8139F18e635d45aD1e62A4A61d2c3D"
+      testRecipient: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+      validatorAnnounce: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
   type: synthetic
diff --git a/deployments/warp_routes/CBBTC/ethereum-flowmainnet-deploy.yaml b/deployments/warp_routes/CBBTC/ethereum-flowmainnet-deploy.yaml
index 7573bb20..dded5286 100644
--- a/deployments/warp_routes/CBBTC/ethereum-flowmainnet-deploy.yaml
+++ b/deployments/warp_routes/CBBTC/ethereum-flowmainnet-deploy.yaml
@@ -2,14 +2,14 @@ ethereum:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xc005dc82818d67AF737725bD4bf75435d065D239"
   owner: "0x58C3FB862a4F5f038C24F8506BE378e9415c5B6C"
-  ownerOverrides:
-    proxyAdmin: "0x58C3FB862a4F5f038C24F8506BE378e9415c5B6C"
+  proxyAdmin:
+    owner: "0x58C3FB862a4F5f038C24F8506BE378e9415c5B6C"
   token: "0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf"
   type: collateral
 flowmainnet:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xd9Cc2e652A162bb93173d1c44d46cd2c0bbDA59D"
   owner: "0xa507DFccA02727B46cBdC600C57E89b2b55E5330"
-  ownerOverrides:
-    proxyAdmin: "0xa507DFccA02727B46cBdC600C57E89b2b55E5330"
+  proxyAdmin:
+    owner: "0xa507DFccA02727B46cBdC600C57E89b2b55E5330"
   type: synthetic
diff --git a/deployments/warp_routes/ETH/ethereum-viction-deploy.yaml b/deployments/warp_routes/ETH/ethereum-viction-deploy.yaml
index 40b73f01..da8bdc4f 100644
--- a/deployments/warp_routes/ETH/ethereum-viction-deploy.yaml
+++ b/deployments/warp_routes/ETH/ethereum-viction-deploy.yaml
@@ -4,7 +4,11 @@ ethereum:
   mailbox: "0xc005dc82818d67AF737725bD4bf75435d065D239"
   owner: "0x3965AC3D295641E452E0ea896a086A9cD7C6C5b6"
   ownerOverrides:
+    _safeAddress: "0x3965AC3D295641E452E0ea896a086A9cD7C6C5b6"
+    fallbackRoutingHook: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
     proxyAdmin: "0x3965AC3D295641E452E0ea896a086A9cD7C6C5b6"
+    testRecipient: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+    validatorAnnounce: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
   type: native
 viction:
   decimals: 18
@@ -14,7 +18,11 @@ viction:
   name: ETH
   owner: "0x23ed65DE22ac29Ec1C16E75EddB0cE3A187357b4"
   ownerOverrides:
+    _icaAddress: "0x23ed65DE22ac29Ec1C16E75EddB0cE3A187357b4"
+    fallbackRoutingHook: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
     proxyAdmin: "0x23ed65DE22ac29Ec1C16E75EddB0cE3A187357b4"
+    testRecipient: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
+    validatorAnnounce: "0xa7ECcdb9Be08178f896c26b7BbD8C3D4E844d9Ba"
   symbol: ETH
   totalSupply: 0
   type: synthetic
diff --git a/deployments/warp_routes/FASTUSD/ethereum-sei-deploy.yaml b/deployments/warp_routes/FASTUSD/ethereum-sei-deploy.yaml
index ef3cc114..20158db8 100644
--- a/deployments/warp_routes/FASTUSD/ethereum-sei-deploy.yaml
+++ b/deployments/warp_routes/FASTUSD/ethereum-sei-deploy.yaml
@@ -12,8 +12,8 @@ sei:
   mailbox: "0x2f2aFaE1139Ce54feFC03593FeE8AB2aDF4a85A7"
   name: fastUSD
   owner: "0x00000000F51340906F767C6999Fe512b1275955C"
-  ownerOverrides:
-    proxyAdmin: "0x00000000F51340906F767C6999Fe512b1275955C"
+  proxyAdmin:
+    owner: "0x00000000F51340906F767C6999Fe512b1275955C"
   symbol: fastUSD
   token: "0x37a4dD9CED2b19Cfe8FAC251cd727b5787E45269"
   type: xERC20
diff --git a/deployments/warp_routes/LUMIA/bsc-ethereum-lumia-deploy.yaml b/deployments/warp_routes/LUMIA/bsc-ethereum-lumia-deploy.yaml
index 4e31bb48..08a93816 100644
--- a/deployments/warp_routes/LUMIA/bsc-ethereum-lumia-deploy.yaml
+++ b/deployments/warp_routes/LUMIA/bsc-ethereum-lumia-deploy.yaml
@@ -1,21 +1,19 @@
 bsc:
   mailbox: "0x2971b9Aec44bE4eb673DF1B88cDB57b96eefe8a4"
   owner: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
-  ownerOverrides:
-    proxyAdmin: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
+  proxyAdmin:
+    owner: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
   type: synthetic
 ethereum:
   mailbox: "0xc005dc82818d67AF737725bD4bf75435d065D239"
   owner: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
-  ownerOverrides:
-    proxyAdmin: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
+  proxyAdmin:
+    owner: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
   token: "0xD9343a049D5DBd89CD19DC6BcA8c48fB3a0a42a7"
   type: collateral
 lumia:
   mailbox: "0x3a867fCfFeC2B790970eeBDC9023E75B0a172aa7"
   owner: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
-  ownerOverrides:
-    proxyAdmin: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
   proxyAdmin:
     address: "0xBC53dACd8c0ac0d2bAC461479EAaf5519eCC8853"
     owner: "0x8bBA07Ddc72455b55530C17e6f6223EF6E156863"
diff --git a/deployments/warp_routes/USDC/ethereum-form-deploy.yaml b/deployments/warp_routes/USDC/ethereum-form-deploy.yaml
index 6cb5946f..7d50ab57 100644
--- a/deployments/warp_routes/USDC/ethereum-form-deploy.yaml
+++ b/deployments/warp_routes/USDC/ethereum-form-deploy.yaml
@@ -2,15 +2,15 @@ ethereum:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xc005dc82818d67AF737725bD4bf75435d065D239"
   owner: "0xec5ad23e29203301B2C1a765718Cc1de7A8d3FbF"
-  ownerOverrides:
-    proxyAdmin: "0xec5ad23e29203301B2C1a765718Cc1de7A8d3FbF"
+  proxyAdmin:
+    owner: "0xec5ad23e29203301B2C1a765718Cc1de7A8d3FbF"
   token: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
   type: collateral
 form:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0x3a464f746D23Ab22155710f44dB16dcA53e0775E"
   owner: "0x41B624412B529409A437f08Ef80bCabE81053650"
-  ownerOverrides:
-    proxyAdmin: "0x41B624412B529409A437f08Ef80bCabE81053650"
+  proxyAdmin:
+    owner: "0x41B624412B529409A437f08Ef80bCabE81053650"
   token: "0xFBf489bb4783D4B1B2e7D07ba39873Fb8068507D"
   type: collateralFiat
diff --git a/deployments/warp_routes/USDT/ethereum-form-deploy.yaml b/deployments/warp_routes/USDT/ethereum-form-deploy.yaml
index af3c1ef4..6eb5d4da 100644
--- a/deployments/warp_routes/USDT/ethereum-form-deploy.yaml
+++ b/deployments/warp_routes/USDT/ethereum-form-deploy.yaml
@@ -2,14 +2,14 @@ ethereum:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0xc005dc82818d67AF737725bD4bf75435d065D239"
   owner: "0xec5ad23e29203301B2C1a765718Cc1de7A8d3FbF"
-  ownerOverrides:
-    proxyAdmin: "0xec5ad23e29203301B2C1a765718Cc1de7A8d3FbF"
+  proxyAdmin:
+    owner: "0xec5ad23e29203301B2C1a765718Cc1de7A8d3FbF"
   token: "0xdac17f958d2ee523a2206206994597c13d831ec7"
   type: collateral
 form:
   interchainSecurityModule: "0x0000000000000000000000000000000000000000"
   mailbox: "0x3a464f746D23Ab22155710f44dB16dcA53e0775E"
   owner: "0x41B624412B529409A437f08Ef80bCabE81053650"
-  ownerOverrides:
-    proxyAdmin: "0x41B624412B529409A437f08Ef80bCabE81053650"
+  proxyAdmin:
+    owner: "0x41B624412B529409A437f08Ef80bCabE81053650"
   type: synthetic