diff --git a/contracts/gateway/GraphTokenGateway.sol b/contracts/gateway/GraphTokenGateway.sol
index 7f3720163..b239af00a 100644
--- a/contracts/gateway/GraphTokenGateway.sol
+++ b/contracts/gateway/GraphTokenGateway.sol
@@ -12,6 +12,9 @@ import "../governance/Managed.sol";
  * @dev This includes everything that's shared between the L1 and L2 sides of the bridge.
  */
 abstract contract GraphTokenGateway is GraphUpgradeable, Pausable, Managed, ITokenGateway {
+    // Storage gap added in case we need to add state variables to this contract
+    uint256[50] private __gap;
+
     /**
      * @dev Check if the caller is the Controller's governor or this contract's pause guardian.
      */
diff --git a/contracts/l2/token/GraphTokenUpgradeable.sol b/contracts/l2/token/GraphTokenUpgradeable.sol
index 6d003c1c3..4ecfb9ffa 100644
--- a/contracts/l2/token/GraphTokenUpgradeable.sol
+++ b/contracts/l2/token/GraphTokenUpgradeable.sol
@@ -50,6 +50,8 @@ contract GraphTokenUpgradeable is GraphUpgradeable, Governed, ERC20BurnableUpgra
     bytes32 private DOMAIN_SEPARATOR;
     mapping(address => bool) private _minters;
     mapping(address => uint256) public nonces;
+    // Storage gap added in case we need to add state variables to this contract
+    uint256[47] private __gap;
 
     // -- Events --