diff --git a/README.md b/README.md
index f20678d..fd92d0c 100644
--- a/README.md
+++ b/README.md
@@ -220,15 +220,16 @@ tenderly actions deploy
 
 ### Deployed Contracts
 
-| Contact Name                   | Ethereum Mainnet                                                                                                      | Goerli                                                                                                               | Gnosis Chain                                                                                                           |
-| ------------------------------ | --------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
-| `ComposableCoW`                | [TBD](https://etherscan.io/address/TBD) | [TBD](https://goerli.etherscan.io/address/TBD) | [TBD](https://gnosisscan.io/address/TBD) |
-| `TWAP`                         | [TBD](https://etherscan.io/address/TBD) | [TBD](https://goerli.etherscan.io/TBD) | [TBD](https://gnosisscan.io/address/TBD) |
-| `CurrentBlockTimestampFactory` | [TBD](https://etherscan.io/address/TBD) | [TBD](https://goerli.etherscan.io/TBD) | [TBD](https://gnosisscan.io/address/TBD) |
-| `GoodAfterTime`                | TBD                                                                                                                   | TBD                                                                                                                  | TBD                                                                                                                    |
-| `PerpetualStableSwap`          | TBD                                                                                                                   | TBD                                                                                                                  | TBD                                                                                                                    |
-| `TradeAboveThreshold`          | TBD                                                                                                                   | TBD                                                                                                                  | TBD                                                                                                                    |
-| `StopLoss`          | TBD                                                                                                                   | TBD                                                                                                                  | TBD                                                                                                                    |
+| Contract Name                  | Ethereum Mainnet                                                                                                      | Goerli                                                                                                                       | Gnosis Chain                                                                                                           |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| `ExtensibleFallbackHandler`    | [0x2f55e8b20D0B9FEFA187AA7d00B6Cbe563605bF5](https://etherscan.io/address/0x2f55e8b20D0B9FEFA187AA7d00B6Cbe563605bF5) | [0x2f55e8b20D0B9FEFA187AA7d00B6Cbe563605bF5](https://goerli.etherscan.io/address/0x2f55e8b20D0B9FEFA187AA7d00B6Cbe563605bF5) | [0x2f55e8b20D0B9FEFA187AA7d00B6Cbe563605bF5](https://gnosisscan.io/address/0x2f55e8b20D0B9FEFA187AA7d00B6Cbe563605bF5) |
+| `ComposableCoW`                | [0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74](https://etherscan.io/address/0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74) | [0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74](https://goerli.etherscan.io/address/0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74) | [0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74](https://gnosisscan.io/address/0xfdaFc9d1902f4e0b84f65F49f244b32b31013b74) |
+| `TWAP`                         | [0x6cF1e9cA41f7611dEf408122793c358a3d11E5a5](https://etherscan.io/address/0x6cF1e9cA41f7611dEf408122793c358a3d11E5a5) | [0x6cF1e9cA41f7611dEf408122793c358a3d11E5a5](https://goerli.etherscan.io/address/0x6cF1e9cA41f7611dEf408122793c358a3d11E5a5) | [0x6cF1e9cA41f7611dEf408122793c358a3d11E5a5](https://gnosisscan.io/address/0x6cF1e9cA41f7611dEf408122793c358a3d11E5a5) |
+| `GoodAfterTime`                | [0xd3338f21c89745e46af56aeaf553cf96ba9bc66f](https://etherscan.io/address/0xd3338f21c89745e46af56aeaf553cf96ba9bc66f) | [0xd3338f21c89745e46af56aeaf553cf96ba9bc66f](https://goerli.etherscan.io/address/0xd3338f21c89745e46af56aeaf553cf96ba9bc66f) | [0xd3338f21c89745e46af56aeaf553cf96ba9bc66f](https://gnosisscan.io/address/0xd3338f21c89745e46af56aeaf553cf96ba9bc66f) |
+| `PerpetualStableSwap`          | [0x519BA24e959E33b3B6220CA98bd353d8c2D89920](https://etherscan.io/address/0x519BA24e959E33b3B6220CA98bd353d8c2D89920) | [0x519BA24e959E33b3B6220CA98bd353d8c2D89920](https://goerli.etherscan.io/address/0x519BA24e959E33b3B6220CA98bd353d8c2D89920) | [0x519BA24e959E33b3B6220CA98bd353d8c2D89920](https://gnosisscan.io/address/0x519BA24e959E33b3B6220CA98bd353d8c2D89920) |
+| `TradeAboveThreshold`          | [0x44569Cbd4E10dd5e97293337964Eff32d58ed352](https://etherscan.io/address/0x44569Cbd4E10dd5e97293337964Eff32d58ed352) | [0x44569Cbd4E10dd5e97293337964Eff32d58ed352](https://goerli.etherscan.io/address/0x44569Cbd4E10dd5e97293337964Eff32d58ed352) | [0x44569Cbd4E10dd5e97293337964Eff32d58ed352](https://gnosisscan.io/address/0x44569Cbd4E10dd5e97293337964Eff32d58ed352) |
+| `StopLoss`                     | [0xE8212F30C28B4AAB467DF3725C14d6e89C2eB967](https://etherscan.io/address/0xE8212F30C28B4AAB467DF3725C14d6e89C2eB967) | [0xE8212F30C28B4AAB467DF3725C14d6e89C2eB967](https://goerli.etherscan.io/address/0xE8212F30C28B4AAB467DF3725C14d6e89C2eB967) | [0xE8212F30C28B4AAB467DF3725C14d6e89C2eB967](https://gnosisscan.io/address/0xE8212F30C28B4AAB467DF3725C14d6e89C2eB967) |
+| `CurrentBlockTimestampFactory` | [0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc](https://etherscan.io/address/0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc) | [0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc](https://goerli.etherscan.io/address/0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc) | [0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc](https://gnosisscan.io/address/0x52eD56Da04309Aca4c3FECC595298d80C2f16BAc) |
 
 #### Audits
 
diff --git a/script/deploy_ProdStack.s.sol b/script/deploy_ProdStack.s.sol
index 3944593..c2f7bb7 100644
--- a/script/deploy_ProdStack.s.sol
+++ b/script/deploy_ProdStack.s.sol
@@ -11,6 +11,10 @@ import {ComposableCoW} from "../src/ComposableCoW.sol";
 
 // Order types
 import {TWAP} from "../src/types/twap/TWAP.sol";
+import {GoodAfterTime} from "../src/types/GoodAfterTime.sol";
+import {PerpetualStableSwap} from "../src/types/PerpetualStableSwap.sol";
+import {TradeAboveThreshold} from "../src/types/TradeAboveThreshold.sol";
+import {StopLoss} from "../src/types/StopLoss.sol";
 
 // Value factories
 import {CurrentBlockTimestampFactory} from "../src/value_factories/CurrentBlockTimestampFactory.sol";
@@ -23,15 +27,19 @@ contract DeployProdStack is Script {
         vm.startBroadcast(deployerPrivateKey);
 
         // Deploy ExtensibleFallbackHandler
-        new ExtensibleFallbackHandler{salt: "v1"}();
+        new ExtensibleFallbackHandler{salt: "v1.0.0"}();
 
         // Deploy ComposableCoW
-        ComposableCoW composableCow = new ComposableCoW{salt: "v1"}(settlement);
+        ComposableCoW composableCow = new ComposableCoW{salt: "v1.0.0"}(settlement);
 
         // Deploy order types
-        new TWAP{salt: "v1"}(composableCow);
+        new TWAP{salt: "v1.0.0"}(composableCow);
+        new GoodAfterTime{salt: "v1.0.0"}();
+        new PerpetualStableSwap{salt: "v1.0.0"}();
+        new TradeAboveThreshold{salt: "v1.0.0"}();
+        new StopLoss{salt: "v1.0.0"}();
 
         // Deploy value factories
-        new CurrentBlockTimestampFactory{salt: "v1"}();
+        new CurrentBlockTimestampFactory{salt: "v1.0.0"}();
     }
 }