diff --git a/helpers/constants.ts b/helpers/constants.ts
index a48a3fee..cb66e8a1 100644
--- a/helpers/constants.ts
+++ b/helpers/constants.ts
@@ -65,6 +65,6 @@ export const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
   UniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(),
   UniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(),
   BptWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
-  MATIC: oneEther.multipliedBy('0.003620948469').toFixed(),
+  WMATIC: oneEther.multipliedBy('0.003620948469').toFixed(),
   USD: '5848466240000000',
 };
diff --git a/helpers/types.ts b/helpers/types.ts
index b7b07980..00c7181b 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -230,7 +230,7 @@ export interface iAssetBase<T> {
   UniWBTCUSDC: T;
   UniYFIWETH: T;
   BptWBTCWETH: T;
-  MATIC: T;
+  WMATIC: T;
 }
 
 export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@@ -292,7 +292,7 @@ export type iMaticPoolAssets<T> = Pick<
   | 'USDT'
   | 'WBTC'
   | 'WETH'
-  | 'MATIC'
+  | 'WMATIC'
 >;
 
 export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>;
@@ -343,7 +343,7 @@ export enum TokenContractId {
   UniWBTCUSDC = 'UniWBTCUSDC',
   UniYFIWETH = 'UniYFIWETH',
   BptWBTCWETH = 'BptWBTCWETH',
-  MATIC = 'MATIC',
+  WMATIC = 'WMATIC',
 }
 
 export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {
diff --git a/markets/matic/commons.ts b/markets/matic/commons.ts
index c591556e..83790bcb 100644
--- a/markets/matic/commons.ts
+++ b/markets/matic/commons.ts
@@ -48,7 +48,7 @@ export const CommonsConfig: ICommonConfiguration = {
     WBTC: {
       borrowRate: oneRay.multipliedBy(0.03).toFixed(),
     },
-    MATIC: {
+    WMATIC: {
       borrowRate: oneRay.multipliedBy(0.05).toFixed(), // TEMP
     },
   },
@@ -168,14 +168,14 @@ export const CommonsConfig: ICommonConfiguration = {
       USDC: '0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7',
       USDT: '0x0A6513e40db6EB1b165753AD52E80663aeA50545',
       WBTC: '0xc907E116054Ad103354f2D350FD2514433D57F6f',
-      MATIC: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0',
+      WMATIC: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0',
     },
     [eEthereumNetwork.mumbai]: {
       DAI: ZERO_ADDRESS,
       USDC: ZERO_ADDRESS,
       USDT: ZERO_ADDRESS,
       WBTC: ZERO_ADDRESS,
-      MATIC: ZERO_ADDRESS,
+      WMATIC: ZERO_ADDRESS,
     },
     [EthereumNetwork.kovan]: {},
     [EthereumNetwork.ropsten]: {},
@@ -184,14 +184,14 @@ export const CommonsConfig: ICommonConfiguration = {
       USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
       USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
       WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
-      MATIC: ZERO_ADDRESS,
+      WMATIC: ZERO_ADDRESS,
     },
     [EthereumNetwork.tenderlyMain]: {
       DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4',
       USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
       USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
       WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
-      MATIC: ZERO_ADDRESS,
+      WMATIC: ZERO_ADDRESS,
     },
   },
   ReserveAssets: {
@@ -228,8 +228,8 @@ export const CommonsConfig: ICommonConfiguration = {
     [eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab',
     [eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     [eEthereumNetwork.tenderlyMain]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    [EthereumNetwork.mumbai]: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf', // No WETH gateway on L2
-    [EthereumNetwork.matic]: '',  // No WETH gateway on L2
+    [EthereumNetwork.mumbai]: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889', // WMATIC address (untested)
+    [EthereumNetwork.matic]: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',  // WMATIC address
   },
   ReserveFactorTreasuryAddress: {
     [eEthereumNetwork.coverage]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
diff --git a/markets/matic/index.ts b/markets/matic/index.ts
index 8dbda72d..ae935313 100644
--- a/markets/matic/index.ts
+++ b/markets/matic/index.ts
@@ -25,7 +25,7 @@ export const MaticConfig: IMaticConfiguration = {
     USDT: strategyUSDT,
     WBTC: strategyWBTC,
     WETH: strategyWETH,
-    MATIC: strategyMATIC,
+    WMATIC: strategyMATIC,
   },
   ReserveAssets: {
     [eEthereumNetwork.buidlerevm]: {},
@@ -37,33 +37,35 @@ export const MaticConfig: IMaticConfiguration = {
       USDT: '0xc2132D05D31c914a87C6611C10748AEb04B58e8F',
       WBTC: '0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6',
       WETH: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',
-      MATIC: '0x0000000000000000000000000000000000001010',
+      WMATIC: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
     },
-    [eEthereumNetwork.mumbai]: { // Mock tokens with a simple "mint" external function
+    [eEthereumNetwork.mumbai]: { // Mock tokens with a simple "mint" external function, except wmatic
       DAI: '0x13b3fda609C1eeb23b4F4b69257840760dCa6C4a',
       USDC: '0x52b63223994433FdE2F1350Ba69Dfd2779f06ABA',
       USDT: '0xB3abd1912F586fDFFa13606882c28E27913853d2',
       WBTC: '0x393E3512d45a956A628124665672312ea86930Ba',
       WETH: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf',
-      MATIC: '0x0000000000000000000000000000000000001010',
+      WMATIC: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889',
     },
     [EthereumNetwork.kovan]: {},
     [EthereumNetwork.ropsten]: {},
-    [EthereumNetwork.main]: {
+    [EthereumNetwork.main]: { 
+      // WMATIC DOES NOT EXIST ON MAIN
       DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
       USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
       USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
       WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
       WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-      MATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
+      WMATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
     },
     [EthereumNetwork.tenderlyMain]: {
+      // WMATIC DOES NOT EXIST ON MAIN
       DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
       USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
       USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
       WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
       WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-      MATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
+      WMATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
     },
   },
 };
diff --git a/tasks/full/5_initialize.ts b/tasks/full/5_initialize.ts
index 858bd77d..3c5bef85 100644
--- a/tasks/full/5_initialize.ts
+++ b/tasks/full/5_initialize.ts
@@ -83,9 +83,9 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.')
 
       const wethAddress = await getWethAddress(poolConfig);
       const lendingPoolAddress = await addressesProvider.getLendingPool();
-      if (network != 'mumbai' && network != 'matic') {
-        await deployWETHGateway([wethAddress, lendingPoolAddress]);
-      }
+
+      await deployWETHGateway([wethAddress, lendingPoolAddress]);
+
     } catch (err) {
       console.error(err);
       exit(1);
diff --git a/test-suites/test-aave/__setup.spec.ts b/test-suites/test-aave/__setup.spec.ts
index 1af7961d..a244e5c9 100644
--- a/test-suites/test-aave/__setup.spec.ts
+++ b/test-suites/test-aave/__setup.spec.ts
@@ -185,7 +185,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
       UniWBTCUSDC: mockTokens.UniWBTCUSDC.address,
       UniYFIWETH: mockTokens.UniYFIWETH.address,
       BptWBTCWETH: mockTokens.BptWBTCWETH.address,
-      MATIC: mockTokens.MATIC.address,
+      WMATIC: mockTokens.WMATIC.address,
       USD: USD_ADDRESS,
     },
     fallbackOracle
diff --git a/test-suites/test-lp/__setup.spec.ts b/test-suites/test-lp/__setup.spec.ts
index cf8d616a..69d54269 100644
--- a/test-suites/test-lp/__setup.spec.ts
+++ b/test-suites/test-lp/__setup.spec.ts
@@ -185,7 +185,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
       UniWBTCUSDC: mockTokens.UniWBTCUSDC.address,
       UniYFIWETH: mockTokens.UniYFIWETH.address,
       BptWBTCWETH: mockTokens.BptWBTCWETH.address,
-      MATIC: mockTokens.MATIC.address,
+      WMATIC: mockTokens.WMATIC.address,
       USD: USD_ADDRESS,
     },
     fallbackOracle