diff --git a/tasks/deploy/config/sepolia/checkpoint-subrewarder.ts b/tasks/deploy/config/sepolia/checkpoint-subrewarder.ts
index efaeefc3e..470f7a7cc 100644
--- a/tasks/deploy/config/sepolia/checkpoint-subrewarder.ts
+++ b/tasks/deploy/config/sepolia/checkpoint-subrewarder.ts
@@ -31,9 +31,8 @@ export const SEPOLIA_CHECKPOINT_SUBREWARDER: HyperdriveCheckpointSubrewarderConf
                 SEPOLIA_CHECKPOINT_REWARDER_NAME,
             ).address,
             (await hre.getNamedAccounts())["deployer"] as Address,
-            hre.hyperdriveDeploy.deployments.byName(
-                `${hre.network.name.toUpperCase()}_REGISTRY`,
-            ).address,
+            hre.hyperdriveDeploy.deployments.byName(`DELV Hyperdrive Registry`)
+                .address,
             hre.hyperdriveDeploy.deployments.byName("DAI").address,
             parseEther("1"),
             parseEther("1"),
diff --git a/tasks/deploy/lib/environment-extensions.ts b/tasks/deploy/lib/environment-extensions.ts
index 80ced686d..fdb56d86e 100644
--- a/tasks/deploy/lib/environment-extensions.ts
+++ b/tasks/deploy/lib/environment-extensions.ts
@@ -589,6 +589,15 @@ extendEnvironment((hre) => {
         console.log(` - Saving ${name}_${prefix}Hyperdrive`);
         deployments.add(name, `${prefix}Hyperdrive`, address);
 
+        // NOTE: There's a bug in hardhat that results in receiving a garbage address for Target0.
+        //       Because of this, we need to retrieve the correct address from the Hyperdrive instance once deployed.
+        await deployments.add(
+            `${name}_${prefix}Target0`,
+            `${prefix}Target0`,
+            await (
+                await hre.viem.getContractAt("IHyperdrive", address)
+            ).read.target0(),
+        );
         return hre.viem.getContractAt(`${prefix}Hyperdrive` as string, address);
     };
     hre.hyperdriveDeploy = {