diff --git a/apps/blockchain/ethereum/src/Escrow.sol b/apps/blockchain/ethereum/src/Escrow.sol
index dbaebace..d965abc7 100644
--- a/apps/blockchain/ethereum/src/Escrow.sol
+++ b/apps/blockchain/ethereum/src/Escrow.sol
@@ -15,6 +15,9 @@ contract StarklaneEscrow is Context {
     // Mapping (collectionAddres => (tokenId => depositor)).
     mapping(address => mapping(uint256 => address)) _escrow;
 
+    // Storage gaps
+    uint256[50] private __gap;
+
     /**
      * @notice Deposits the given tokens into escrow.
      *
@@ -87,4 +90,8 @@ contract StarklaneEscrow is Context {
     function _isEscrowed(address collection, uint256 id) internal view returns (bool) {
         return _escrow[collection][id] > address(0x0);
     }
+
 }
+
+
+
diff --git a/apps/blockchain/ethereum/src/Messaging.sol b/apps/blockchain/ethereum/src/Messaging.sol
index 159634f8..f5b7a503 100644
--- a/apps/blockchain/ethereum/src/Messaging.sol
+++ b/apps/blockchain/ethereum/src/Messaging.sol
@@ -32,6 +32,9 @@ contract StarklaneMessaging is Ownable {
     // The mapping mimics the Starknet messaging with a ref count like status.
     mapping(bytes32 => uint256) _autoWithdrawn;
 
+    // Storage gaps
+    uint256[50] private __gap;
+
     /**
      */
     event MessageHashAutoWithdrawAdded(bytes32 msgHash);
@@ -92,4 +95,7 @@ contract StarklaneMessaging is Ownable {
             revert WithdrawMethodError();
         }
     }
+
 }
+
+
diff --git a/apps/blockchain/ethereum/src/State.sol b/apps/blockchain/ethereum/src/State.sol
index ad7056a7..dd6b483b 100644
--- a/apps/blockchain/ethereum/src/State.sol
+++ b/apps/blockchain/ethereum/src/State.sol
@@ -19,6 +19,9 @@ contract StarklaneState is Ownable {
 
     // Bridge L2 selector to deposit token from L1.
     felt252 _starklaneL2Selector;
+    
+    // Storage gaps
+    uint256[50] private __gap;
 
     /**
      * @notice Retrieves info about Starklane L2 mapping.
@@ -47,4 +50,10 @@ contract StarklaneState is Ownable {
     function setStarklaneL2Selector(uint256 l2Selector) public onlyOwner {
         _starklaneL2Selector = Cairo.felt252Wrap(l2Selector);
     }
+
+
+
 }
+
+
+
diff --git a/apps/blockchain/ethereum/src/UUPSProxied.sol b/apps/blockchain/ethereum/src/UUPSProxied.sol
index eb42be86..12d52497 100644
--- a/apps/blockchain/ethereum/src/UUPSProxied.sol
+++ b/apps/blockchain/ethereum/src/UUPSProxied.sol
@@ -14,6 +14,9 @@ error NotPayableError();
 contract UUPSOwnableProxied is Ownable, UUPSUpgradeable {
     // Mapping for implementations initialization.
     mapping(address implementation => bool initialized) _initializedImpls;
+  
+    // Storage gaps
+    uint256[50] private __gap;
 
     // onlyInit
     modifier onlyInit() {
diff --git a/apps/blockchain/ethereum/src/token/CollectionManager.sol b/apps/blockchain/ethereum/src/token/CollectionManager.sol
index b21ad993..2704a2fd 100644
--- a/apps/blockchain/ethereum/src/token/CollectionManager.sol
+++ b/apps/blockchain/ethereum/src/token/CollectionManager.sol
@@ -22,6 +22,9 @@ contract CollectionManager {
     // Mapping between L1<->L2 contracts addresses.
     mapping(address => snaddress) _l1ToL2Addresses;
 
+    // Storage gaps
+    uint256[50] private __gap;
+
     /**
      * @notice A collection has been deployed due to the
      *    first token being bridged from L2.