diff --git a/deployments/BaseGoerli.json b/deployments/BaseGoerli.json
index 9b2aef97..153c83cc 100644
--- a/deployments/BaseGoerli.json
+++ b/deployments/BaseGoerli.json
@@ -1,3 +1,3 @@
 {
-    "Engine": "0x497F44169C8Fa5E2b84da6e1Fa3f3163FE181172"
+    "Engine": "0x319Ae7F3a0D635eD9CCF0276dCeAF680F9C7c397"
 }
\ No newline at end of file
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
index c658afa7..da1279bf 100644
--- a/script/Deploy.s.sol
+++ b/script/Deploy.s.sol
@@ -18,13 +18,15 @@ contract Setup is Script {
         address perpsMarketProxy,
         address spotMarketProxy,
         address sUSDProxy,
-        address oracle
+        address oracle,
+        address trustedForwarder
     ) public returns (Engine engine) {
         engine = new Engine({
             _perpsMarketProxy: perpsMarketProxy,
             _spotMarketProxy: spotMarketProxy,
             _sUSDProxy: sUSDProxy,
-            _oracle: oracle
+            _oracle: oracle,
+            _trustedForwarder: trustedForwarder
         });
     }
 }
@@ -41,7 +43,8 @@ contract DeployBase is Setup, BaseParameters {
             perpsMarketProxy: PERPS_MARKET_PROXY,
             spotMarketProxy: SPOT_MARKET_PROXY,
             sUSDProxy: USD_PROXY,
-            oracle: PYTH
+            oracle: PYTH,
+            trustedForwarder: TRUSTED_FORWARDER
         });
 
         vm.stopBroadcast();
@@ -60,7 +63,8 @@ contract DeployBaseGoerli is Setup, BaseGoerliParameters {
             perpsMarketProxy: PERPS_MARKET_PROXY,
             spotMarketProxy: SPOT_MARKET_PROXY,
             sUSDProxy: USD_PROXY,
-            oracle: PYTH
+            oracle: PYTH,
+            trustedForwarder: TRUSTED_FORWARDER
         });
 
         vm.stopBroadcast();
@@ -79,7 +83,8 @@ contract DeployOptimism is Setup, OptimismParameters {
             perpsMarketProxy: PERPS_MARKET_PROXY,
             spotMarketProxy: SPOT_MARKET_PROXY,
             sUSDProxy: USD_PROXY,
-            oracle: PYTH
+            oracle: PYTH,
+            trustedForwarder: TRUSTED_FORWARDER
         });
 
         vm.stopBroadcast();
@@ -98,7 +103,8 @@ contract DeployOptimismGoerli is Setup, OptimismGoerliParameters {
             perpsMarketProxy: PERPS_MARKET_PROXY,
             spotMarketProxy: SPOT_MARKET_PROXY,
             sUSDProxy: USD_PROXY,
-            oracle: PYTH
+            oracle: PYTH,
+            trustedForwarder: TRUSTED_FORWARDER
         });
 
         vm.stopBroadcast();
diff --git a/script/utils/parameters/BaseGoerliParameters.sol b/script/utils/parameters/BaseGoerliParameters.sol
index b367e3a4..56a782a3 100644
--- a/script/utils/parameters/BaseGoerliParameters.sol
+++ b/script/utils/parameters/BaseGoerliParameters.sol
@@ -12,4 +12,6 @@ contract BaseGoerliParameters {
         0x579c612E4Bf390f5504DB9f76b6F5759A3172279;
 
     address public constant PYTH = 0x5955C1478F0dAD753C7E2B4dD1b4bC530C64749f;
+
+    address public constant TRUSTED_FORWARDER = 0xAE788aaf52780741E12BF79Ad684B91Bb0EF4D92;
 }
diff --git a/script/utils/parameters/BaseParameters.sol b/script/utils/parameters/BaseParameters.sol
index 01ea1811..19fb2717 100644
--- a/script/utils/parameters/BaseParameters.sol
+++ b/script/utils/parameters/BaseParameters.sol
@@ -9,4 +9,7 @@ contract BaseParameters {
     address public constant USD_PROXY = address(0);
 
     address public constant PYTH = 0x8250f4aF4B972684F7b336503E2D6dFeDeB1487a;
+
+    /// @custom:todo Base doesn't have a trusted forwarder yet
+    address public constant TRUSTED_FORWARDER = address(0);
 }
diff --git a/script/utils/parameters/OptimismGoerliParameters.sol b/script/utils/parameters/OptimismGoerliParameters.sol
index d22dd024..d0c3775a 100644
--- a/script/utils/parameters/OptimismGoerliParameters.sol
+++ b/script/utils/parameters/OptimismGoerliParameters.sol
@@ -12,4 +12,7 @@ contract OptimismGoerliParameters {
         0xe487Ad4291019b33e2230F8E2FB1fb6490325260;
 
     address public constant PYTH = 0xff1a0f4744e8582DF1aE09D5611b887B6a12925C;
+
+    /// @custom:todo Optimism Goerli doesn't have a trusted forwarder yet
+    address public constant TRUSTED_FORWARDER = 0xAE788aaf52780741E12BF79Ad684B91Bb0EF4D92;
 }
diff --git a/script/utils/parameters/OptimismParameters.sol b/script/utils/parameters/OptimismParameters.sol
index d6e80c34..10679c61 100644
--- a/script/utils/parameters/OptimismParameters.sol
+++ b/script/utils/parameters/OptimismParameters.sol
@@ -11,4 +11,7 @@ contract OptimismParameters {
         0xb2F30A7C980f052f02563fb518dcc39e6bf38175;
 
     address public constant PYTH = 0xff1a0f4744e8582DF1aE09D5611b887B6a12925C;
+
+    /// @custom:todo Optimism doesn't have a trusted forwarder yet
+    address public constant TRUSTED_FORWARDER = address(0);
 }