diff --git a/contracts/arbitrum/connectors/aave/v3/main.sol b/contracts/arbitrum/connectors/aave/v3/main.sol
index 941aa138..d5ed5c1c 100644
--- a/contracts/arbitrum/connectors/aave/v3/main.sol
+++ b/contracts/arbitrum/connectors/aave/v3/main.sol
@@ -390,9 +390,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && !getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, true);
+			bool isEth = tokens[i] == ethAddr;
+			address _token = isEth ? wethAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && !getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, true);
 			}
 		}
 
@@ -416,9 +418,10 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, false);
+			bool isEth = tokens[i] == ethAddr;
+			address _token = isEth ? wethAddr : tokens[i];
+			if (getCollateralBalance(_token) > 0 && getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, false);
 			}
 		}
 
@@ -441,8 +444,11 @@ abstract contract AaveResolver is Events, Helpers {
 
 		uint256 currentRateMode = rateMode == 1 ? 2 : 1;
 
-		if (getPaybackBalance(token, currentRateMode) > 0) {
-			aave.swapBorrowRateMode(token, rateMode);
+		bool isEth = token == ethAddr;
+		address _token = isEth ? wethAddr : token;
+
+		if (getPaybackBalance(_token, currentRateMode) > 0) {
+			aave.swapBorrowRateMode(_token, rateMode);
 		}
 
 		_eventName = "LogSwapRateMode(address,uint256)";
diff --git a/contracts/avalanche/connectors/aave/v3/main.sol b/contracts/avalanche/connectors/aave/v3/main.sol
index 3fc3f86f..f92cb0b6 100644
--- a/contracts/avalanche/connectors/aave/v3/main.sol
+++ b/contracts/avalanche/connectors/aave/v3/main.sol
@@ -390,9 +390,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && !getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, true);
+			bool isAVAX = tokens[i] == avaxAddr;
+			address _token = isAVAX ? wavaxAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && !getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, true);
 			}
 		}
 
@@ -416,9 +418,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, false);
+			bool isAVAX = tokens[i] == avaxAddr;
+			address _token = isAVAX ? wavaxAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, false);
 			}
 		}
 
@@ -441,8 +445,11 @@ abstract contract AaveResolver is Events, Helpers {
 
 		uint256 currentRateMode = rateMode == 1 ? 2 : 1;
 
-		if (getPaybackBalance(token, currentRateMode) > 0) {
-			aave.swapBorrowRateMode(token, rateMode);
+		bool isAVAX = token == avaxAddr;
+		address _token = isAVAX ? wavaxAddr : token;
+
+		if (getPaybackBalance(_token, currentRateMode) > 0) {
+			aave.swapBorrowRateMode(_token, rateMode);
 		}
 
 		_eventName = "LogSwapRateMode(address,uint256)";
diff --git a/contracts/fantom/connectors/aave/v3/main.sol b/contracts/fantom/connectors/aave/v3/main.sol
index 4457e1f8..bc4038bd 100644
--- a/contracts/fantom/connectors/aave/v3/main.sol
+++ b/contracts/fantom/connectors/aave/v3/main.sol
@@ -390,9 +390,10 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && !getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, true);
+			bool isFTM = tokens[i] == ftmAddr;
+			address _token = isFTM ? wftmAddr : tokens[i];
+			if (getCollateralBalance(_token) > 0 && !getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, true);
 			}
 		}
 
@@ -416,9 +417,10 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, false);
+			bool isFTM = tokens[i] == ftmAddr;
+			address _token = isFTM ? wftmAddr : tokens[i];
+			if (getCollateralBalance(_token) > 0 && getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, false);
 			}
 		}
 
@@ -440,9 +442,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		uint256 currentRateMode = rateMode == 1 ? 2 : 1;
+		bool isFTM = token == ftmAddr;
+		address _token = isFTM ? wftmAddr : token;
 
-		if (getPaybackBalance(token, currentRateMode) > 0) {
-			aave.swapBorrowRateMode(token, rateMode);
+		if (getPaybackBalance(_token, currentRateMode) > 0) {
+			aave.swapBorrowRateMode(_token, rateMode);
 		}
 
 		_eventName = "LogSwapRateMode(address,uint256)";
diff --git a/contracts/optimism/connectors/aave/v3/main.sol b/contracts/optimism/connectors/aave/v3/main.sol
index 523c2545..639f9deb 100644
--- a/contracts/optimism/connectors/aave/v3/main.sol
+++ b/contracts/optimism/connectors/aave/v3/main.sol
@@ -390,9 +390,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && !getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, true);
+			bool isEth = tokens[i] == ethAddr;
+			address _token = isEth ? wethAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && !getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, true);
 			}
 		}
 
@@ -416,9 +418,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, false);
+			bool isEth = tokens[i] == ethAddr;
+			address _token = isEth ? wethAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, false);
 			}
 		}
 
@@ -441,8 +445,11 @@ abstract contract AaveResolver is Events, Helpers {
 
 		uint256 currentRateMode = rateMode == 1 ? 2 : 1;
 
-		if (getPaybackBalance(token, currentRateMode) > 0) {
-			aave.swapBorrowRateMode(token, rateMode);
+		bool isEth = token == ethAddr;
+		address _token = isEth ? wethAddr : token;
+
+		if (getPaybackBalance(_token, currentRateMode) > 0) {
+			aave.swapBorrowRateMode(_token, rateMode);
 		}
 
 		_eventName = "LogSwapRateMode(address,uint256)";
diff --git a/contracts/polygon/connectors/aave/v3/main.sol b/contracts/polygon/connectors/aave/v3/main.sol
index e8b45987..535269a0 100644
--- a/contracts/polygon/connectors/aave/v3/main.sol
+++ b/contracts/polygon/connectors/aave/v3/main.sol
@@ -390,9 +390,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && !getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, true);
+			bool isMatic = tokens[i] == maticAddr;
+			address _token = isMatic ? wmaticAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && !getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, true);
 			}
 		}
 
@@ -416,9 +418,11 @@ abstract contract AaveResolver is Events, Helpers {
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		for (uint256 i = 0; i < _length; i++) {
-			address token = tokens[i];
-			if (getCollateralBalance(token) > 0 && getIsColl(token)) {
-				aave.setUserUseReserveAsCollateral(token, false);
+			bool isMatic = tokens[i] == maticAddr;
+			address _token = isMatic ? wmaticAddr : tokens[i];
+
+			if (getCollateralBalance(_token) > 0 && getIsColl(_token)) {
+				aave.setUserUseReserveAsCollateral(_token, false);
 			}
 		}
 
@@ -441,8 +445,11 @@ abstract contract AaveResolver is Events, Helpers {
 
 		uint256 currentRateMode = rateMode == 1 ? 2 : 1;
 
-		if (getPaybackBalance(token, currentRateMode) > 0) {
-			aave.swapBorrowRateMode(token, rateMode);
+		bool isMatic = token == maticAddr;
+		address _token = isMatic ? wmaticAddr : token;
+
+		if (getPaybackBalance(_token, currentRateMode) > 0) {
+			aave.swapBorrowRateMode(_token, rateMode);
 		}
 
 		_eventName = "LogSwapRateMode(address,uint256)";