diff --git a/setup-templates/template-deploy/foundry.toml b/setup-templates/template-deploy/foundry.toml
index a0958483..a4656dbe 100644
--- a/setup-templates/template-deploy/foundry.toml
+++ b/setup-templates/template-deploy/foundry.toml
@@ -2,7 +2,6 @@
 src = 'src'
 out = 'out'
 libs = ['lib']
-script = 'execute'
 broadcast = 'records'
 fs_permissions = [ {access = "read-write", path = "./"} ]
 optimizer = true
@@ -14,7 +13,8 @@ remappings = [
     '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts',
     '@rari-capital/solmate/=lib/solmate/',
     '@base-contracts/=lib/base-contracts',
-    'solady/=lib/solady/src/'
+    'solady/=lib/solady/src/',
+    'src/universal=lib/optimism/packages/contracts-bedrock/src/universal'
 ]
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
diff --git a/setup-templates/template-generic/foundry.toml b/setup-templates/template-generic/foundry.toml
index 0be0575a..10455014 100644
--- a/setup-templates/template-generic/foundry.toml
+++ b/setup-templates/template-generic/foundry.toml
@@ -14,7 +14,8 @@ remappings = [
     '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts',
     '@rari-capital/solmate/=lib/solmate/',
     '@base-contracts/=lib/base-contracts',
-    'solady/=lib/solady/src/'
+    'solady/=lib/solady/src/',
+    'src/universal=lib/optimism/packages/contracts-bedrock/src/universal'
 ]
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
\ No newline at end of file
diff --git a/setup-templates/template-incident/foundry.toml b/setup-templates/template-incident/foundry.toml
index 0be0575a..10455014 100644
--- a/setup-templates/template-incident/foundry.toml
+++ b/setup-templates/template-incident/foundry.toml
@@ -14,7 +14,8 @@ remappings = [
     '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts',
     '@rari-capital/solmate/=lib/solmate/',
     '@base-contracts/=lib/base-contracts',
-    'solady/=lib/solady/src/'
+    'solady/=lib/solady/src/',
+    'src/universal=lib/optimism/packages/contracts-bedrock/src/universal'
 ]
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
\ No newline at end of file
diff --git a/setup-templates/template-incident/script/DeleteL2Outputs.s.sol b/setup-templates/template-incident/script/DeleteL2Outputs.s.sol
index 07d034f3..8805d529 100644
--- a/setup-templates/template-incident/script/DeleteL2Outputs.s.sol
+++ b/setup-templates/template-incident/script/DeleteL2Outputs.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "@eth-optimism-bedrock/contracts/L1/L2OutputOracle.sol";
+import "@eth-optimism-bedrock/src/L1/L2OutputOracle.sol";
 import "@base-contracts/src/Challenger1of2.sol";
 import "@base-contracts/script/universal/MultisigBuilder.sol";
 
diff --git a/setup-templates/template-incident/script/PausePortal.s.sol b/setup-templates/template-incident/script/PausePortal.s.sol
index cba5e253..31e4a6fc 100644
--- a/setup-templates/template-incident/script/PausePortal.s.sol
+++ b/setup-templates/template-incident/script/PausePortal.s.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import "@base-contracts/script/universal/MultisigBuilder.sol";
-import "@eth-optimism-bedrock/contracts/L1/OptimismPortal.sol";
+import "@eth-optimism-bedrock/src/L1/OptimismPortal.sol";
 
 contract PausePortal is MultisigBuilder {
     address constant internal OPTIMISM_PORTAL_PROXY = vm.envAddress("OPTIMISM_PORTAL_PROXY"); // TODO: define OPTIMISM_PORTAL_PROXY=xxx in the .env file
diff --git a/setup-templates/template-incident/script/SetupNewProposer.s.sol b/setup-templates/template-incident/script/SetupNewProposer.s.sol
index 7903b2ed..83f4f74a 100644
--- a/setup-templates/template-incident/script/SetupNewProposer.s.sol
+++ b/setup-templates/template-incident/script/SetupNewProposer.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "@eth-optimism-bedrock/contracts/L1/L2OutputOracle.sol";
+import "@eth-optimism-bedrock/src/L1/L2OutputOracle.sol";
 import "forge-std/Script.sol";
 
 contract SetupNewProposer is Script {
diff --git a/setup-templates/template-incident/script/UnpausePortal.s.sol b/setup-templates/template-incident/script/UnpausePortal.s.sol
index 0516fe30..95724cbe 100644
--- a/setup-templates/template-incident/script/UnpausePortal.s.sol
+++ b/setup-templates/template-incident/script/UnpausePortal.s.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import "@base-contracts/script/universal/MultisigBuilder.sol";
-import "@eth-optimism-bedrock/contracts/L1/OptimismPortal.sol";
+import "@eth-optimism-bedrock/src/L1/OptimismPortal.sol";
 
 contract UnpausePortal is MultisigBuilder {
     address constant internal OPTIMISM_PORTAL_PROXY = vm.envAddress("OPTIMISM_PORTAL_PROXY"); // TODO: define OPTIMISM_PORTAL_PROXY=xxx in the .env file