diff --git a/foundry.toml b/foundry.toml
index 895927e..47b893d 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -5,9 +5,8 @@ script = 'scripts'
 out = 'out'
 libs = ['lib']
 fs_permissions = [{access = "write", path = "./reports"}]
-solc = '0.8.19'
+solc = '0.8.20'
 evm_version = 'shanghai'
-auto_detect-remappings=false
 no_match_path = "*.s.sol"
 
 [rpc_endpoints]
diff --git a/remappings.txt b/remappings.txt
index e5d141a..fb1c03f 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,23 +1,5 @@
 aave-v3-origin/=lib/aave-address-book/lib/aave-v3-origin/src/
-aave-governance-v3=lib/aave-governance-v3/src
-solidity-utils/=lib/aave-governance-v3/lib/solidity-utils/src
-@aave/core-v3/=lib/aave-governance-v3/lib/aave-address-book/lib/aave-v3-core/
-@aave/periphery-v3/=lib/aave-governance-v3/lib/aave-address-book/lib/aave-v3-periphery/
-@openzeppelin/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/lib/openzeppelin-contracts/
-aave-address-book/=lib/aave-address-book/src/
-aave-delivery-infrastructure-scripts/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/scripts/
-aave-delivery-infrastructure/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/
-aave-token-v2/=lib/aave-governance-v3/lib/aave-token-v3/lib/aave-token-v2/contracts/
-aave-token-v3/=lib/aave-governance-v3/lib/aave-token-v3/
-aave-v3-core/=lib/aave-address-book/lib/aave-v3-origin/src/core/
-aave-v3-periphery/=lib/aave-address-book/lib/aave-v3-origin/src/periphery/
-ds-test/=lib/forge-std/lib/ds-test/src/
-erc4626-tests/=lib/aave-governance-v3/lib/openzeppelin-contracts/lib/erc4626-tests/
-forge-std/=lib/forge-std/src/
-fx-portal/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/lib/fx-portal/contracts/
-hyperlane-monorepo/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/lib/hyperlane-monorepo/
-nitro-contracts/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/lib/nitro-contracts/src/
-openzeppelin-contracts-upgradeable/=lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/
-openzeppelin-contracts/=lib/aave-governance-v3/lib/openzeppelin-contracts/
-openzeppelin/=lib/aave-governance-v3/lib/openzeppelin-contracts/contracts/
-solidity-examples/=lib/aave-governance-v3/lib/aave-delivery-infrastructure/lib/solidity-examples/contracts/
+aave-governance-v3/=lib/aave-governance-v3/src/
+solidity-utils/=lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/src/
+openzeppelin-contracts/=lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/
+lib/aave-governance-v3:solidity-utils/=lib/aave-governance-v3/lib/solidity-utils/src
diff --git a/scripts/PermissionedPayloadsControllerAndExecutor.s.sol b/scripts/PermissionedPayloadsControllerAndExecutor.s.sol
index 072fa2a..95cbaad 100644
--- a/scripts/PermissionedPayloadsControllerAndExecutor.s.sol
+++ b/scripts/PermissionedPayloadsControllerAndExecutor.s.sol
@@ -7,7 +7,8 @@ import {Executor} from 'aave-governance-v3/contracts/payloads/Executor.sol';
 import {PermissionedPayloadsController, IPayloadsControllerCore, PayloadsControllerUtils, IPermissionedPayloadsController}
   from 'aave-governance-v3/contracts/payloads/PermissionedPayloadsController.sol';
 import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
-import {IOwnable} from 'solidity-utils/contracts/transparent-proxy/interfaces/IOwnable.sol';
+import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
+import {IOwnable} from 'aave-address-book/common/IOwnable.sol';
 
 contract PermissionedPayloadsControllerAndExecutorDeploy is Script {
   function run(
@@ -31,7 +32,7 @@ contract PermissionedPayloadsControllerAndExecutorDeploy is Script {
     permissionedPayloadsController = IPermissionedPayloadsController(
       proxyFactory.create(
         address(permissionedPayloadsController),
-        proxyOwner,
+        ProxyAdmin(proxyOwner),
         abi.encodeWithSelector(
           IPermissionedPayloadsController.initialize.selector,
           guardian,
diff --git a/tests/PermissionedControllerEmissionTestMATICXPolygon.t.sol b/tests/PermissionedControllerEmissionTestMATICXPolygon.t.sol
index ade1531..ca97204 100644
--- a/tests/PermissionedControllerEmissionTestMATICXPolygon.t.sol
+++ b/tests/PermissionedControllerEmissionTestMATICXPolygon.t.sol
@@ -7,8 +7,9 @@ import {LMSetupBaseTest} from './utils/LMSetupBaseTest.sol';
 import {IPermissionedPayloadsController, PayloadsControllerUtils, IPayloadsControllerCore} from 'aave-address-book/governance-v3/IPermissionedPayloadsController.sol';
 
 // TEMPORARY IMPORTS
-import {IOwnable} from 'solidity-utils/contracts/transparent-proxy/interfaces/IOwnable.sol';
+import {IOwnable} from 'aave-address-book/common/IOwnable.sol';
 import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
+import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
 import {Executor} from 'aave-governance-v3/contracts/payloads/Executor.sol';
 import {PermissionedPayloadsController} from 'aave-governance-v3/contracts/payloads/PermissionedPayloadsController.sol';
 import {IERC20} from 'forge-std/interfaces/IERC20.sol';
@@ -136,7 +137,7 @@ contract PermissionedControllerEmissionTestMATICXPolygon is LMSetupBaseTest {
     PAYLOADS_CONTROLLER = IPermissionedPayloadsController(
       proxyFactory.create(
         address(permissionedPayloadsControllerImpl),
-        address(728),
+        ProxyAdmin(address(728)),
         abi.encodeWithSelector(
           IPermissionedPayloadsController.initialize.selector,
           address(490),