diff --git a/rvsol/foundry.toml b/rvsol/foundry.toml
index 739a754b..2e6162d9 100644
--- a/rvsol/foundry.toml
+++ b/rvsol/foundry.toml
@@ -5,7 +5,7 @@ libs = ['lib']
 optimizer = true
 optimizer_runs = 999999
 remappings = [
-  '@optimism/packages/contracts-bedrock=lib/optimism/packages/contracts-bedrock',
+  '@optimism/=lib/optimism/packages/contracts-bedrock',
   '@openzeppelin/contracts-upgradeable/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable/contracts',
   '@openzeppelin/contracts/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts',
   '@rari-capital/solmate/=lib/optimism/packages/contracts-bedrock/lib/solmate',
diff --git a/rvsol/src/Step.sol b/rvsol/src/Step.sol
index b3c9ae0c..2f95af24 100644
--- a/rvsol/src/Step.sol
+++ b/rvsol/src/Step.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {IPreimageOracle} from "@optimism/packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol";
+import {IPreimageOracle} from "@optimism/src/cannon/interfaces/IPreimageOracle.sol";
 
 contract Step {
 
diff --git a/rvsol/test/Step.t.sol b/rvsol/test/Step.t.sol
index 08611c8d..73185c5f 100644
--- a/rvsol/test/Step.t.sol
+++ b/rvsol/test/Step.t.sol
@@ -2,7 +2,7 @@ pragma solidity 0.8.15;
 
 import {Test} from "forge-std/Test.sol";
 import {Step} from "src/Step.sol";
-import {PreimageOracle} from "@optimism/packages/contracts-bedrock/src/cannon/PreimageOracle.sol";
+import {PreimageOracle} from "@optimism/src/cannon/PreimageOracle.sol";
 
 contract Step_Test is Test {
     PreimageOracle internal oracle;