diff --git a/packages/contracts-bedrock/tasks/genesis-l1.ts b/packages/contracts-bedrock/tasks/genesis-l1.ts
index dd22245423d6e..e01043582f545 100644
--- a/packages/contracts-bedrock/tasks/genesis-l1.ts
+++ b/packages/contracts-bedrock/tasks/genesis-l1.ts
@@ -3,6 +3,7 @@ import fs from 'fs'
 import { ethers } from 'ethers'
 import { task } from 'hardhat/config'
 import { Genesis, State } from '@eth-optimism/core-utils'
+import '@eth-optimism/hardhat-deploy-config'
 
 task('genesis-l1', 'create a genesis config')
   .addOptionalParam(
diff --git a/packages/contracts-bedrock/tasks/genesis-l2.ts b/packages/contracts-bedrock/tasks/genesis-l2.ts
index 8b5b2bd66afa5..0e3ff69ff5a49 100644
--- a/packages/contracts-bedrock/tasks/genesis-l2.ts
+++ b/packages/contracts-bedrock/tasks/genesis-l2.ts
@@ -141,7 +141,6 @@ task('genesis-l2', 'create a genesis config')
       predeployAddrs.add(ethers.utils.getAddress(addr))
     }
 
-    // TODO: geth likes strings for nonce and balance now
     const alloc: State = {}
 
     // Set a proxy at each predeploy address
diff --git a/packages/contracts-bedrock/tasks/rollup-config.ts b/packages/contracts-bedrock/tasks/rollup-config.ts
index b90add90c0d41..268d2b39e47fe 100644
--- a/packages/contracts-bedrock/tasks/rollup-config.ts
+++ b/packages/contracts-bedrock/tasks/rollup-config.ts
@@ -3,6 +3,8 @@ import fs from 'fs'
 import { task } from 'hardhat/config'
 import { OpNodeConfig, getChainId } from '@eth-optimism/core-utils'
 import { ethers } from 'ethers'
+import 'hardhat-deploy'
+import '@eth-optimism/hardhat-deploy-config'
 
 task('rollup-config', 'create a genesis config')
   .addOptionalParam(