diff --git a/deploy/006-mockOVM_BondManager.deploy.ts b/deploy/006-mockOVM_BondManager.deploy.ts
index f584f558..8de2d1aa 100644
--- a/deploy/006-mockOVM_BondManager.deploy.ts
+++ b/deploy/006-mockOVM_BondManager.deploy.ts
@@ -2,7 +2,10 @@
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 
 /* Imports: Internal */
-import { getDeployedContract } from '../src/hardhat-deploy-ethers'
+import {
+  getDeployedContract,
+  registerAddress,
+} from '../src/hardhat-deploy-ethers'
 
 const deployFn: DeployFunction = async (hre) => {
   const { deploy } = hre.deployments
@@ -26,7 +29,11 @@ const deployFn: DeployFunction = async (hre) => {
     return
   }
 
-  await Lib_AddressManager.setAddress('OVM_BondManager', result.address)
+  await registerAddress({
+    hre,
+    name: 'OVM_BondManager',
+    address: result.address,
+  })
 }
 
 deployFn.dependencies = ['Lib_AddressManager']
diff --git a/deploy/007-OVM_L1CrossDomainMessenger.deploy.ts b/deploy/007-OVM_L1CrossDomainMessenger.deploy.ts
index 5ab6678d..d7a030cc 100644
--- a/deploy/007-OVM_L1CrossDomainMessenger.deploy.ts
+++ b/deploy/007-OVM_L1CrossDomainMessenger.deploy.ts
@@ -2,7 +2,10 @@
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 
 /* Imports: Internal */
-import { getDeployedContract } from '../src/hardhat-deploy-ethers'
+import {
+  getDeployedContract,
+  registerAddress,
+} from '../src/hardhat-deploy-ethers'
 
 const deployFn: DeployFunction = async (hre) => {
   const { deploy } = hre.deployments
@@ -50,10 +53,11 @@ const deployFn: DeployFunction = async (hre) => {
     )
   }
 
-  await Lib_AddressManager.setAddress(
-    'OVM_L1CrossDomainMessenger',
-    result.address
-  )
+  await registerAddress({
+    hre,
+    name: 'OVM_L1CrossDomainMessenger',
+    address: OVM_L1CrossDomainMessenger.address,
+  })
 }
 
 deployFn.dependencies = ['Lib_AddressManager']
diff --git a/deploy/008-Proxy__OVM_L1CrossDomainMessenger.deploy.ts b/deploy/008-Proxy__OVM_L1CrossDomainMessenger.deploy.ts
index 51a02a75..983bd67d 100644
--- a/deploy/008-Proxy__OVM_L1CrossDomainMessenger.deploy.ts
+++ b/deploy/008-Proxy__OVM_L1CrossDomainMessenger.deploy.ts
@@ -2,7 +2,10 @@
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 
 /* Imports: Internal */
-import { getDeployedContract } from '../src/hardhat-deploy-ethers'
+import {
+  getDeployedContract,
+  registerAddress,
+} from '../src/hardhat-deploy-ethers'
 
 const deployFn: DeployFunction = async (hre) => {
   const { deploy } = hre.deployments
@@ -49,10 +52,11 @@ const deployFn: DeployFunction = async (hre) => {
     )
   }
 
-  await Lib_AddressManager.setAddress(
-    'Proxy__OVM_L1CrossDomainMessenger',
-    result.address
-  )
+  await registerAddress({
+    hre,
+    name: 'Proxy__OVM_L1CrossDomainMessenger',
+    address: Proxy__OVM_L1CrossDomainMessenger.address,
+  })
 }
 
 deployFn.dependencies = ['Lib_AddressManager', 'OVM_L1CrossDomainMessenger']
diff --git a/deploy/015-OVM_L1ETHGateway.deploy.ts b/deploy/015-OVM_L1ETHGateway.deploy.ts
index 85aa3cc1..d279a963 100644
--- a/deploy/015-OVM_L1ETHGateway.deploy.ts
+++ b/deploy/015-OVM_L1ETHGateway.deploy.ts
@@ -2,7 +2,10 @@
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 
 /* Imports: Internal */
-import { getDeployedContract } from '../src/hardhat-deploy-ethers'
+import {
+  getDeployedContract,
+  registerAddress,
+} from '../src/hardhat-deploy-ethers'
 import { predeploys } from '../src/predeploys'
 
 const deployFn: DeployFunction = async (hre) => {
@@ -50,7 +53,11 @@ const deployFn: DeployFunction = async (hre) => {
     )
   }
 
-  await Lib_AddressManager.setAddress('OVM_L1ETHGateway', result.address)
+  await registerAddress({
+    hre,
+    name: 'OVM_L1ETHGateway',
+    address: OVM_L1ETHGateway.address,
+  })
 }
 
 deployFn.dependencies = ['Lib_AddressManager']
diff --git a/deploy/016-Proxy__OVM_L1ETHGateway.deploy.ts b/deploy/016-Proxy__OVM_L1ETHGateway.deploy.ts
index 2c57e94b..7f038527 100644
--- a/deploy/016-Proxy__OVM_L1ETHGateway.deploy.ts
+++ b/deploy/016-Proxy__OVM_L1ETHGateway.deploy.ts
@@ -2,7 +2,10 @@
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 
 /* Imports: Internal */
-import { getDeployedContract } from '../src/hardhat-deploy-ethers'
+import {
+  getDeployedContract,
+  registerAddress,
+} from '../src/hardhat-deploy-ethers'
 import { predeploys } from '../src/predeploys'
 
 const deployFn: DeployFunction = async (hre) => {
@@ -53,7 +56,11 @@ const deployFn: DeployFunction = async (hre) => {
     )
   }
 
-  await Lib_AddressManager.setAddress('Proxy__OVM_L1ETHGateway', result.address)
+  await registerAddress({
+    hre,
+    name: 'Proxy__OVM_L1ETHGateway',
+    address: Proxy__OVM_L1ETHGateway.address,
+  })
 }
 
 deployFn.dependencies = ['Lib_AddressManager', 'OVM_L1ETHGateway']