diff --git a/hardhat.config.ts b/hardhat.config.ts
index dbfb63f5e..80773ca28 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -76,8 +76,8 @@ const v8Settings = {
 const config: HardhatUserConfig = {
     solidity: {
         compilers: [
-            { version: '0.8.21', settings: v8Settings }, // PoCo Boost
-            { version: '0.6.12', settings }, // PoCo contracts
+            { version: '0.8.21', settings: v8Settings }, // PoCo contracts
+            { version: '0.6.12', settings }, // External dependencies (@amxx/factory)
             { version: '0.4.24', settings }, // RLC contracts
         ],
     },
diff --git a/package-lock.json b/package-lock.json
index 097ead56c..83197f0fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,6 @@
       "version": "6.1.0-rc.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@iexec/interface": "3.0.35-8",
-        "@iexec/solidity": "^0.1.1",
         "@mudgen/diamond-1": "github:mudgen/diamond-1-hardhat#3da037b",
         "@openzeppelin/contracts": "^5.0.2",
         "@uniswap/v2-periphery": "1.1.0-beta.0",
@@ -868,25 +866,6 @@
         "@ethersproject/strings": "^5.7.0"
       }
     },
-    "node_modules/@iexec/interface": {
-      "version": "3.0.35-8",
-      "resolved": "https://registry.npmjs.org/@iexec/interface/-/interface-3.0.35-8.tgz",
-      "integrity": "sha512-JkO9bpfpTBCOtJz/TEPzFTLlgamv7fll8RUpwC+8P6UWlGGwCe/IvgAeUZzIJ/syXaAhC0KZ7/03BEiee3f8fg=="
-    },
-    "node_modules/@iexec/solidity": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@iexec/solidity/-/solidity-0.1.1.tgz",
-      "integrity": "sha512-XLCihhVxsA77Ug9tVnz0uiUAzVdpZGlkSzfoUTLUfYDxUr+iwXJ6zvsBKomnAvvLsRJ0lb4qiBmSMpGtZ9am4w==",
-      "dependencies": {
-        "@openzeppelin/contracts": "3.2.0",
-        "solstruct": "0.1.0"
-      }
-    },
-    "node_modules/@iexec/solidity/node_modules/@openzeppelin/contracts": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.2.0.tgz",
-      "integrity": "sha512-bUOmkSoPkjnUyMiKo6RYnb0VHBk5D9KKDAgNLzF41aqAM3TeE0yGdFF5dVRcV60pZdJLlyFT/jjXIZCWyyEzAQ=="
-    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
@@ -11434,11 +11413,6 @@
         "hardhat": "^2.8.0"
       }
     },
-    "node_modules/solstruct": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/solstruct/-/solstruct-0.1.0.tgz",
-      "integrity": "sha512-7XiFF2g3R08tsfhhZfKbKheNC0A5lsdAxk5R2HVPzT/kwenTh8AUzmQoc10xw+zXO813KRRLK3t65KqgUE2T4w=="
-    },
     "node_modules/source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -13560,27 +13534,6 @@
         "@ethersproject/strings": "^5.7.0"
       }
     },
-    "@iexec/interface": {
-      "version": "3.0.35-8",
-      "resolved": "https://registry.npmjs.org/@iexec/interface/-/interface-3.0.35-8.tgz",
-      "integrity": "sha512-JkO9bpfpTBCOtJz/TEPzFTLlgamv7fll8RUpwC+8P6UWlGGwCe/IvgAeUZzIJ/syXaAhC0KZ7/03BEiee3f8fg=="
-    },
-    "@iexec/solidity": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@iexec/solidity/-/solidity-0.1.1.tgz",
-      "integrity": "sha512-XLCihhVxsA77Ug9tVnz0uiUAzVdpZGlkSzfoUTLUfYDxUr+iwXJ6zvsBKomnAvvLsRJ0lb4qiBmSMpGtZ9am4w==",
-      "requires": {
-        "@openzeppelin/contracts": "3.2.0",
-        "solstruct": "0.1.0"
-      },
-      "dependencies": {
-        "@openzeppelin/contracts": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.2.0.tgz",
-          "integrity": "sha512-bUOmkSoPkjnUyMiKo6RYnb0VHBk5D9KKDAgNLzF41aqAM3TeE0yGdFF5dVRcV60pZdJLlyFT/jjXIZCWyyEzAQ=="
-        }
-      }
-    },
     "@jridgewell/resolve-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
@@ -21322,11 +21275,6 @@
         "solidity-ast": "^0.4.38"
       }
     },
-    "solstruct": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/solstruct/-/solstruct-0.1.0.tgz",
-      "integrity": "sha512-7XiFF2g3R08tsfhhZfKbKheNC0A5lsdAxk5R2HVPzT/kwenTh8AUzmQoc10xw+zXO813KRRLK3t65KqgUE2T4w=="
-    },
     "source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
diff --git a/package.json b/package.json
index f1c129938..32fe66ace 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,6 @@
     ]
   },
   "dependencies": {
-    "@iexec/interface": "3.0.35-8",
-    "@iexec/solidity": "^0.1.1",
     "@mudgen/diamond-1": "github:mudgen/diamond-1-hardhat#3da037b",
     "@openzeppelin/contracts": "^5.0.2",
     "@uniswap/v2-periphery": "1.1.0-beta.0",
@@ -54,7 +52,6 @@
     "rlc-faucet-contract": "1.0.10"
   },
   "__dependenciesComments": {
-    "@iexec/solidity": "TODO replace with openzeppelin contracts when possible",
     "rlc-faucet-contract": "TODO Replace with rlc-token if possible"
   },
   "devDependencies": {
diff --git a/test/byContract/registries/registries.test.ts b/test/byContract/registries/registries.test.ts
index cf3d94832..96f4837d5 100644
--- a/test/byContract/registries/registries.test.ts
+++ b/test/byContract/registries/registries.test.ts
@@ -15,13 +15,11 @@ import {
     Dataset__factory,
     IexecInterfaceNative,
     IexecInterfaceNative__factory,
+    InitializableUpgradeabilityProxy__factory,
     WorkerpoolRegistry,
     WorkerpoolRegistry__factory,
     Workerpool__factory,
 } from '../../../typechain';
-//import the correct InitializableUpgradeabilityProxy__factory from the local registry's proxy instead of @iexec/solidity
-//TODO: merge with the previous import when @iexec/solidity will be removed
-import { InitializableUpgradeabilityProxy__factory } from '../../../typechain/factories/contracts/registries/proxy/InitializableUpgradeabilityProxy__factory';
 import config from '../../../utils/config';
 import { MULTIADDR_BYTES } from '../../../utils/constants';
 import { getIexecAccounts } from '../../../utils/poco-tools';