diff --git a/contracts/mocks/oracle/CLAggregators/MockAggregator.sol b/contracts/mocks/oracle/CLAggregators/MockAggregator.sol
index 192cd27a0..52033cdc0 100644
--- a/contracts/mocks/oracle/CLAggregators/MockAggregator.sol
+++ b/contracts/mocks/oracle/CLAggregators/MockAggregator.sol
@@ -3,11 +3,14 @@ pragma solidity 0.6.12;
 
 contract MockAggregator {
   int256 private _latestAnswer;
+  uint8 private _decimals;
 
   event AnswerUpdated(int256 indexed current, uint256 indexed roundId, uint256 timestamp);
 
-  constructor(int256 _initialAnswer) public {
+  constructor(int256 _initialAnswer, uint8 _aggregatorDecimals) public {
     _latestAnswer = _initialAnswer;
+    _decimals = _aggregatorDecimals;
+
     emit AnswerUpdated(_initialAnswer, 0, now);
   }
 
@@ -19,8 +22,11 @@ contract MockAggregator {
     return 1;
   }
 
-  // function getSubTokens() external view returns (address[] memory) {
-  // TODO: implement mock for when multiple subtokens. Maybe we need to create diff mock contract
-  // to call it from the migration for this case??
-  // }
+  /**
+   * @notice represents the number of decimals the aggregator responses represent.
+   * @dev Allows to support UiPoolDataProviderV2V3 that expects Chainlink Aggregators interface.
+   */
+  function decimals() external view returns (uint8) {
+    return _decimals;
+  }
 }
diff --git a/helpers/constants.ts b/helpers/constants.ts
index 253435d7d..d6de286fd 100644
--- a/helpers/constants.ts
+++ b/helpers/constants.ts
@@ -86,7 +86,7 @@ export const chainlinkAggregatorProxy = {
   'arbitrum-rinkeby': '0x5f0423B1a6935dc5596e7A24d98532b67A0AeFd8',
   arbitrum: '0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612',
   rinkeby: '0x8A753747A1Fa494EC906cE90E9f37563A8AF630e',
-  goerli: '0x9F54B624fb17d07816C5552f8AB133c21b0322cD',
+  goerli: '0x7f65Ad9264F6319A818c3cEfc473Cf17e561b5C7',
 };
 
 export const chainlinkEthUsdAggregatorProxy = {
@@ -100,5 +100,5 @@ export const chainlinkEthUsdAggregatorProxy = {
   'arbitrum-rinkeby': '0x5f0423B1a6935dc5596e7A24d98532b67A0AeFd8',
   arbitrum: '0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612',
   rinkeby: '0x8A753747A1Fa494EC906cE90E9f37563A8AF630e',
-  goerli: '0x9F54B624fb17d07816C5552f8AB133c21b0322cD',
+  goerli: '0x7f65Ad9264F6319A818c3cEfc473Cf17e561b5C7',
 };
diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts
index 7292a217f..24f2583ed 100644
--- a/helpers/contracts-deployments.ts
+++ b/helpers/contracts-deployments.ts
@@ -271,7 +271,7 @@ export const deployLendingRateOracle = async (verify?: boolean) =>
 
 export const deployMockAggregator = async (price: tStringTokenSmallUnits, verify?: boolean) =>
   withSaveAndVerify(
-    await new MockAggregatorFactory(await getFirstSigner()).deploy(price),
+    await new MockAggregatorFactory(await getFirstSigner()).deploy(price, 18),
     eContractid.MockAggregator,
     [price],
     verify