diff --git a/bedrock-devnet/devnet/__init__.py b/bedrock-devnet/devnet/__init__.py
index 364c5fa791673..f9a6c494301e6 100644
--- a/bedrock-devnet/devnet/__init__.py
+++ b/bedrock-devnet/devnet/__init__.py
@@ -61,7 +61,7 @@ def main():
         addresses = read_json(addresses_json_path)
     else:
         log.info('Deploying contracts.')
-        run_command(['yarn', 'hardhat', '--network', 'devnetL1', 'deploy'], env={
+        run_command(['yarn', 'hardhat', '--network', 'devnetL1', 'deploy', '--tags', 'l1'], env={
             'CHAIN_ID': '900',
             'L1_RPC': 'http://localhost:8545',
             'PRIVATE_KEY_DEPLOYER': 'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
diff --git a/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts b/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts
index ad2080398aea8..21c0f97ea8fd6 100644
--- a/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts
+++ b/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts
@@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['ProxyAdmin', 'setup']
+deployFn.tags = ['ProxyAdmin', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/001-AddressManager.ts b/packages/contracts-bedrock/deploy/001-AddressManager.ts
index 1ab62bd7f2e6d..c572f9d3dfcc1 100644
--- a/packages/contracts-bedrock/deploy/001-AddressManager.ts
+++ b/packages/contracts-bedrock/deploy/001-AddressManager.ts
@@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['AddressManager', 'setup']
+deployFn.tags = ['AddressManager', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts b/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts
index 1a0b1cedf62e1..92d310b8033e0 100644
--- a/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts
+++ b/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts
@@ -16,6 +16,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L1StandardBridgeProxy', 'setup']
+deployFn.tags = ['L1StandardBridgeProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts b/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts
index d873166d0be0c..5c2982c82f271 100644
--- a/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts
+++ b/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts
@@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L2OutputOracleProxy', 'setup']
+deployFn.tags = ['L2OutputOracleProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts b/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts
index b16f70ea4e5f3..e54781c2f8be6 100644
--- a/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts
+++ b/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts
@@ -13,6 +13,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L1CrossDomainMessengerProxy', 'setup']
+deployFn.tags = ['L1CrossDomainMessengerProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts b/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts
index 5e5922ad93568..7a347545e0216 100644
--- a/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts
+++ b/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts
@@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['OptimismPortalProxy', 'setup']
+deployFn.tags = ['OptimismPortalProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts b/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts
index fb3f803b497fe..9324d872b1a76 100644
--- a/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts
+++ b/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts
@@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['OptimismMintableERC20FactoryProxy', 'setup']
+deployFn.tags = ['OptimismMintableERC20FactoryProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts b/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts
index 79366a94d0dfb..546f2d86038f6 100644
--- a/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts
+++ b/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts
@@ -16,6 +16,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L1ERC721BridgeProxy', 'setup']
+deployFn.tags = ['L1ERC721BridgeProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts b/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts
index 7dceab1a7fb36..09580efb3508a 100644
--- a/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts
+++ b/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts
@@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['SystemConfigProxy', 'setup']
+deployFn.tags = ['SystemConfigProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts b/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts
index e409da1e65d95..01b4610b469d7 100644
--- a/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts
+++ b/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts
@@ -16,6 +16,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['SystemDictatorProxy', 'setup']
+deployFn.tags = ['SystemDictatorProxy', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/010-L1CrossDomainMessengerImpl.ts b/packages/contracts-bedrock/deploy/010-L1CrossDomainMessengerImpl.ts
index 2b19451b46651..4bb61c2a16620 100644
--- a/packages/contracts-bedrock/deploy/010-L1CrossDomainMessengerImpl.ts
+++ b/packages/contracts-bedrock/deploy/010-L1CrossDomainMessengerImpl.ts
@@ -26,6 +26,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L1CrossDomainMessengerImpl', 'setup']
+deployFn.tags = ['L1CrossDomainMessengerImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/011-L1StandardBridgeImpl.ts b/packages/contracts-bedrock/deploy/011-L1StandardBridgeImpl.ts
index 90029fad0512d..6ce1610e1e147 100644
--- a/packages/contracts-bedrock/deploy/011-L1StandardBridgeImpl.ts
+++ b/packages/contracts-bedrock/deploy/011-L1StandardBridgeImpl.ts
@@ -32,6 +32,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L1StandardBridgeImpl', 'setup']
+deployFn.tags = ['L1StandardBridgeImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/012-L2OutputOracleImpl.ts b/packages/contracts-bedrock/deploy/012-L2OutputOracleImpl.ts
index 3e50876e67e40..672bfbe8c03bb 100644
--- a/packages/contracts-bedrock/deploy/012-L2OutputOracleImpl.ts
+++ b/packages/contracts-bedrock/deploy/012-L2OutputOracleImpl.ts
@@ -60,6 +60,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L2OutputOracleImpl', 'setup']
+deployFn.tags = ['L2OutputOracleImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts b/packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
index 00b94b52c22cd..c438ba2a91b3e 100644
--- a/packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
+++ b/packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
@@ -67,6 +67,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['OptimismPortalImpl', 'setup']
+deployFn.tags = ['OptimismPortalImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/014-OptimismMintableERC20FactoryImpl.ts b/packages/contracts-bedrock/deploy/014-OptimismMintableERC20FactoryImpl.ts
index 649c4c40ab5f3..b1deca9bbb79a 100644
--- a/packages/contracts-bedrock/deploy/014-OptimismMintableERC20FactoryImpl.ts
+++ b/packages/contracts-bedrock/deploy/014-OptimismMintableERC20FactoryImpl.ts
@@ -26,6 +26,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['OptimismMintableERC20FactoryImpl', 'setup']
+deployFn.tags = ['OptimismMintableERC20FactoryImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/015-L1ERC721BridgeImpl.ts b/packages/contracts-bedrock/deploy/015-L1ERC721BridgeImpl.ts
index 60ed7747416f9..fb1d01d2c05e1 100644
--- a/packages/contracts-bedrock/deploy/015-L1ERC721BridgeImpl.ts
+++ b/packages/contracts-bedrock/deploy/015-L1ERC721BridgeImpl.ts
@@ -27,6 +27,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['L1ERC721BridgeImpl', 'setup']
+deployFn.tags = ['L1ERC721BridgeImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/016-PortalSenderImpl.ts b/packages/contracts-bedrock/deploy/016-PortalSenderImpl.ts
index 4eef346eb072d..e86cf4670260a 100644
--- a/packages/contracts-bedrock/deploy/016-PortalSenderImpl.ts
+++ b/packages/contracts-bedrock/deploy/016-PortalSenderImpl.ts
@@ -26,6 +26,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['PortalSenderImpl', 'setup']
+deployFn.tags = ['PortalSenderImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts b/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts
index fdb254ed67ad1..cb13ede4cea2d 100644
--- a/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts
+++ b/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts
@@ -66,6 +66,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['SystemConfigImpl', 'setup']
+deployFn.tags = ['SystemConfigImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/018-SystemDictatorImpl.ts b/packages/contracts-bedrock/deploy/018-SystemDictatorImpl.ts
index 1b55c897ca86a..6134fa7359245 100644
--- a/packages/contracts-bedrock/deploy/018-SystemDictatorImpl.ts
+++ b/packages/contracts-bedrock/deploy/018-SystemDictatorImpl.ts
@@ -12,6 +12,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
 }
 
-deployFn.tags = ['SystemDictatorImpl', 'setup']
+deployFn.tags = ['SystemDictatorImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts b/packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts
index 0b4695c590970..28a3a56762a46 100644
--- a/packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts
+++ b/packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts
@@ -200,6 +200,6 @@ const deployFn: DeployFunction = async (hre) => {
   }
 }
 
-deployFn.tags = ['SystemDictatorImpl', 'setup']
+deployFn.tags = ['SystemDictatorImpl', 'setup', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts b/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts
index 460d600accdd8..480af8a7533bd 100644
--- a/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts
+++ b/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts
@@ -279,14 +279,14 @@ const deployFn: DeployFunction = async (hre) => {
       need to restart the system, run exit1() followed by finalize().
     `,
     checks: async () => {
-      assert(
-        (await AddressManager.getAddress('OVM_L1CrossDomainMessenger')) ===
-          ethers.constants.AddressZero
+      const messenger = await AddressManager.getAddress(
+        'OVM_L1CrossDomainMessenger'
       )
+      assert(messenger === ethers.constants.AddressZero)
     },
   })
 }
 
-deployFn.tags = ['SystemDictatorSteps', 'phase1']
+deployFn.tags = ['SystemDictatorSteps', 'phase1', 'l1']
 
 export default deployFn
diff --git a/packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts b/packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts
index 2eca71a06831a..fa44f1be70994 100644
--- a/packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts
+++ b/packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts
@@ -116,10 +116,8 @@ const deployFn: DeployFunction = async (hre) => {
         'BondManager',
       ]
       for (const dead of deads) {
-        assert(
-          (await AddressManager.getAddress(dead)) ===
-            ethers.constants.AddressZero
-        )
+        const addr = await AddressManager.getAddress(dead)
+        assert(addr === ethers.constants.AddressZero)
       }
     },
   })
@@ -372,6 +370,6 @@ const deployFn: DeployFunction = async (hre) => {
   }
 }
 
-deployFn.tags = ['SystemDictatorSteps', 'phase2']
+deployFn.tags = ['SystemDictatorSteps', 'phase2', 'l1']
 
 export default deployFn