diff --git a/script/universal/IGnosisSafe.sol b/script/universal/IGnosisSafe.sol
deleted file mode 100644
index fae736a..0000000
--- a/script/universal/IGnosisSafe.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.10;
-
-/// @title Enum - Collection of enums used in Safe contracts.
-/// @author Richard Meissner - @rmeissner
-abstract contract Enum {
-    enum Operation {
-        Call,
-        DelegateCall
-    }
-}
-
-/// @title IGnosisSafe - Gnosis Safe Interface
-interface IGnosisSafe {
-    event AddedOwner(address owner);
-    event ApproveHash(bytes32 indexed approvedHash, address indexed owner);
-    event ChangedFallbackHandler(address handler);
-    event ChangedGuard(address guard);
-    event ChangedThreshold(uint256 threshold);
-    event DisabledModule(address module);
-    event EnabledModule(address module);
-    event ExecutionFailure(bytes32 txHash, uint256 payment);
-    event ExecutionFromModuleFailure(address indexed module);
-    event ExecutionFromModuleSuccess(address indexed module);
-    event ExecutionSuccess(bytes32 txHash, uint256 payment);
-    event RemovedOwner(address owner);
-    event SafeReceived(address indexed sender, uint256 value);
-    event SafeSetup(
-        address indexed initiator, address[] owners, uint256 threshold, address initializer, address fallbackHandler
-    );
-    event SignMsg(bytes32 indexed msgHash);
-
-    function VERSION() external view returns (string memory);
-    function addOwnerWithThreshold(address owner, uint256 _threshold) external;
-    function approveHash(bytes32 hashToApprove) external;
-    function approvedHashes(address, bytes32) external view returns (uint256);
-    function changeThreshold(uint256 _threshold) external;
-    function checkNSignatures(bytes32 dataHash, bytes memory data, bytes memory signatures, uint256 requiredSignatures)
-        external
-        view;
-    function checkSignatures(bytes32 dataHash, bytes memory data, bytes memory signatures) external view;
-    function disableModule(address prevModule, address module) external;
-    function domainSeparator() external view returns (bytes32);
-    function enableModule(address module) external;
-    function encodeTransactionData(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
-        uint256 _nonce
-    ) external view returns (bytes memory);
-    function execTransaction(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
-        bytes memory signatures
-    ) external payable returns (bool success);
-    function execTransactionFromModule(address to, uint256 value, bytes memory data, Enum.Operation operation)
-        external
-        returns (bool success);
-    function execTransactionFromModuleReturnData(address to, uint256 value, bytes memory data, Enum.Operation operation)
-        external
-        returns (bool success, bytes memory returnData);
-    function getChainId() external view returns (uint256);
-    function getModulesPaginated(address start, uint256 pageSize)
-        external
-        view
-        returns (address[] memory array, address next);
-    function getOwners() external view returns (address[] memory);
-    function getStorageAt(uint256 offset, uint256 length) external view returns (bytes memory);
-    function getThreshold() external view returns (uint256);
-    function getTransactionHash(
-        address to,
-        uint256 value,
-        bytes memory data,
-        Enum.Operation operation,
-        uint256 safeTxGas,
-        uint256 baseGas,
-        uint256 gasPrice,
-        address gasToken,
-        address refundReceiver,
-        uint256 _nonce
-    ) external view returns (bytes32);
-    function isModuleEnabled(address module) external view returns (bool);
-    function isOwner(address owner) external view returns (bool);
-    function nonce() external view returns (uint256);
-    function removeOwner(address prevOwner, address owner, uint256 _threshold) external;
-    function requiredTxGas(address to, uint256 value, bytes memory data, Enum.Operation operation)
-        external
-        returns (uint256);
-    function setFallbackHandler(address handler) external;
-    function setGuard(address guard) external;
-    function setup(
-        address[] memory _owners,
-        uint256 _threshold,
-        address to,
-        bytes memory data,
-        address fallbackHandler,
-        address paymentToken,
-        uint256 payment,
-        address paymentReceiver
-    ) external;
-    function signedMessages(bytes32) external view returns (uint256);
-    function simulateAndRevert(address targetContract, bytes memory calldataPayload) external;
-    function swapOwner(address prevOwner, address oldOwner, address newOwner) external;
-}
diff --git a/script/universal/MultisigBase.sol b/script/universal/MultisigBase.sol
index b98ae64..5758fac 100644
--- a/script/universal/MultisigBase.sol
+++ b/script/universal/MultisigBase.sol
@@ -5,7 +5,7 @@ import {Vm} from "forge-std/Vm.sol";
 import {console} from "forge-std/console.sol";
 import {CommonBase} from "forge-std/Base.sol";
 import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
-import {IGnosisSafe, Enum} from "./IGnosisSafe.sol";
+import {IGnosisSafe, Enum} from "@eth-optimism-bedrock/scripts/interfaces/IGnosisSafe.sol";
 import {Simulation} from "./Simulation.sol";
 import {Signatures} from "./Signatures.sol";
 
diff --git a/script/universal/Signatures.sol b/script/universal/Signatures.sol
index d515715..0d7b100 100644
--- a/script/universal/Signatures.sol
+++ b/script/universal/Signatures.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 
 import {Bytes} from "@eth-optimism-bedrock/src/libraries/Bytes.sol";
 import {LibSort} from "@solady/utils/LibSort.sol";
-import {IGnosisSafe} from "./IGnosisSafe.sol";
+import {IGnosisSafe} from "@eth-optimism-bedrock/scripts/interfaces/IGnosisSafe.sol";
 
 library Signatures {
     function prepareSignatures(IGnosisSafe _safe, bytes32 hash, bytes memory _signatures)
diff --git a/script/universal/Simulation.sol b/script/universal/Simulation.sol
index a8612bc..134267e 100644
--- a/script/universal/Simulation.sol
+++ b/script/universal/Simulation.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 
 import {console} from "forge-std/console.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {IGnosisSafe} from "./IGnosisSafe.sol";
+import {IGnosisSafe} from "@eth-optimism-bedrock/scripts/interfaces/IGnosisSafe.sol";
 
 library Simulation {
     address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
diff --git a/test/universal/MultisigBuilder.t.sol b/test/universal/MultisigBuilder.t.sol
index c5b8b86..05e0f36 100644
--- a/test/universal/MultisigBuilder.t.sol
+++ b/test/universal/MultisigBuilder.t.sol
@@ -7,7 +7,7 @@ import {console} from "forge-std/console.sol";
 import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
 import {MultisigBuilder} from "../../script/universal/MultisigBuilder.sol";
-import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
+import {IGnosisSafe} from "@eth-optimism-bedrock/scripts/interfaces/IGnosisSafe.sol";
 import {Counter} from "./Counter.sol";
 
 contract MultisigBuilderTest is Test, MultisigBuilder {
diff --git a/test/universal/NestedMultisigBuilder.t.sol b/test/universal/NestedMultisigBuilder.t.sol
index 8131cc0..3675afc 100644
--- a/test/universal/NestedMultisigBuilder.t.sol
+++ b/test/universal/NestedMultisigBuilder.t.sol
@@ -7,7 +7,7 @@ import {console} from "forge-std/console.sol";
 import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
 import {NestedMultisigBuilder} from "../../script/universal/NestedMultisigBuilder.sol";
-import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
+import {IGnosisSafe} from "@eth-optimism-bedrock/scripts/interfaces/IGnosisSafe.sol";
 import {Counter} from "./Counter.sol";
 
 contract NestedMultisigBuilderTest is Test, NestedMultisigBuilder {