diff --git a/environments/.env.latest b/environments/.env.latest
index f5520f0a0..e04372125 100644
--- a/environments/.env.latest
+++ b/environments/.env.latest
@@ -3,7 +3,7 @@ SERVER_PORT=80
 SOLC_REPO=/home/data/solc-bin/linux-amd64
 SOLJSON_REPO=/home/data/solc-bin/soljson
 SESSION_SECRET=xxx
-IPFS_GATEWAY=http://ipfs-latest:8080/ipfs/
+IPFS_GATEWAY=http://ipfs-gateway-latest:8080/ipfs/
 REPOSITORY_PATH=../../data/repository
 
 # Repository web server config
diff --git a/environments/.env.stable b/environments/.env.stable
index 2f7e26723..6759e9242 100644
--- a/environments/.env.stable
+++ b/environments/.env.stable
@@ -3,7 +3,7 @@ SERVER_PORT=80
 SOLC_REPO=/home/data/solc-bin/linux-amd64
 SOLJSON_REPO=/home/data/solc-bin/soljson
 SESSION_SECRET=xxx
-IPFS_GATEWAY=http://ipfs-stable:8080/ipfs/
+IPFS_GATEWAY=http://ipfs-gateway-stable:8080/ipfs/
 REPOSITORY_PATH=../../data/repository
 
 # Repository web server config
diff --git a/package-lock.json b/package-lock.json
index 38038756e..315a6d588 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "cors": "^2.8.5",
         "directory-tree": "^3.5.1",
         "dotenv": "^8.2.0",
-        "ethers": "^6.6.2",
+        "ethers": "^6.6.5",
         "express": "^4.17.1",
         "express-fileupload": "^1.4.0",
         "express-oauth2-jwt-bearer": "^1.5.0",
@@ -7327,7 +7327,9 @@
       }
     },
     "node_modules/ethers": {
-      "version": "6.6.2",
+      "version": "6.6.5",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.6.5.tgz",
+      "integrity": "sha512-Tc3HXzI0UJ9EhPp6E0fntkgMIA2//rhcB0UsmiRMCR+Bii5iu0RjtwJV55IhlLJ4K39pd0ku+eE4WRgqrLLW2Q==",
       "funding": [
         {
           "type": "individual",
@@ -7338,7 +7340,6 @@
           "url": "https://www.buymeacoffee.com/ricmoo"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "@adraffy/ens-normalize": "1.9.2",
         "@noble/hashes": "1.1.2",
@@ -21408,7 +21409,7 @@
     },
     "packages/bytecode-utils": {
       "name": "@ethereum-sourcify/bytecode-utils",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "MIT",
       "dependencies": {
         "@ethersproject/bytes": "^5.7.0",
@@ -27800,7 +27801,7 @@
     },
     "packages/lib-sourcify": {
       "name": "@ethereum-sourcify/lib-sourcify",
-      "version": "1.1.2",
+      "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
         "@ethereum-sourcify/bytecode-utils": "*",
@@ -27858,10 +27859,6 @@
         "node": ">=0.10.0"
       }
     },
-    "packages/lib-sourcify/node_modules/@adraffy/ens-normalize": {
-      "version": "1.9.2",
-      "license": "MIT"
-    },
     "packages/lib-sourcify/node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "dev": true,
@@ -29194,16 +29191,6 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "packages/lib-sourcify/node_modules/@noble/secp256k1": {
-      "version": "1.7.1",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT"
-    },
     "packages/lib-sourcify/node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "dev": true,
@@ -29573,10 +29560,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "packages/lib-sourcify/node_modules/aes-js": {
-      "version": "4.0.0-beta.5",
-      "license": "MIT"
-    },
     "packages/lib-sourcify/node_modules/agent-base": {
       "version": "6.0.2",
       "dev": true,
@@ -32028,65 +32011,6 @@
         "@scure/bip39": "1.2.1"
       }
     },
-    "packages/lib-sourcify/node_modules/ethers": {
-      "version": "6.6.2",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/ethers-io/"
-        },
-        {
-          "type": "individual",
-          "url": "https://www.buymeacoffee.com/ricmoo"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@adraffy/ens-normalize": "1.9.2",
-        "@noble/hashes": "1.1.2",
-        "@noble/secp256k1": "1.7.1",
-        "@types/node": "18.15.13",
-        "aes-js": "4.0.0-beta.5",
-        "tslib": "2.4.0",
-        "ws": "8.5.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "packages/lib-sourcify/node_modules/ethers/node_modules/@noble/hashes": {
-      "version": "1.1.2",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "license": "MIT"
-    },
-    "packages/lib-sourcify/node_modules/ethers/node_modules/@types/node": {
-      "version": "18.15.13",
-      "license": "MIT"
-    },
-    "packages/lib-sourcify/node_modules/ethers/node_modules/ws": {
-      "version": "8.5.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "packages/lib-sourcify/node_modules/expand-tilde": {
       "version": "2.0.2",
       "dev": true,
@@ -36920,6 +36844,7 @@
     },
     "packages/lib-sourcify/node_modules/tslib": {
       "version": "2.4.0",
+      "dev": true,
       "license": "0BSD"
     },
     "packages/lib-sourcify/node_modules/tsutils": {
@@ -41613,9 +41538,6 @@
           "version": "1.2.6",
           "dev": true
         },
-        "@adraffy/ens-normalize": {
-          "version": "1.9.2"
-        },
         "@babel/code-frame": {
           "version": "7.12.11",
           "dev": true,
@@ -46422,9 +46344,6 @@
         "@noble/hashes": {
           "version": "1.3.1"
         },
-        "@noble/secp256k1": {
-          "version": "1.7.1"
-        },
         "@nodelib/fs.scandir": {
           "version": "2.1.5",
           "dev": true,
@@ -46638,9 +46557,6 @@
           "version": "1.0.0",
           "dev": true
         },
-        "aes-js": {
-          "version": "4.0.0-beta.5"
-        },
         "agent-base": {
           "version": "6.0.2",
           "dev": true,
@@ -48244,30 +48160,6 @@
             "@scure/bip39": "1.2.1"
           }
         },
-        "ethers": {
-          "version": "6.6.2",
-          "requires": {
-            "@adraffy/ens-normalize": "1.9.2",
-            "@noble/hashes": "1.1.2",
-            "@noble/secp256k1": "1.7.1",
-            "@types/node": "18.15.13",
-            "aes-js": "4.0.0-beta.5",
-            "tslib": "2.4.0",
-            "ws": "8.5.0"
-          },
-          "dependencies": {
-            "@noble/hashes": {
-              "version": "1.1.2"
-            },
-            "@types/node": {
-              "version": "18.15.13"
-            },
-            "ws": {
-              "version": "8.5.0",
-              "requires": {}
-            }
-          }
-        },
         "expand-tilde": {
           "version": "2.0.2",
           "dev": true,
@@ -51251,7 +51143,8 @@
           }
         },
         "tslib": {
-          "version": "2.4.0"
+          "version": "2.4.0",
+          "dev": true
         },
         "tsutils": {
           "version": "3.21.0",
@@ -56515,7 +56408,9 @@
       "version": "1.8.1"
     },
     "ethers": {
-      "version": "6.6.2",
+      "version": "6.6.5",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.6.5.tgz",
+      "integrity": "sha512-Tc3HXzI0UJ9EhPp6E0fntkgMIA2//rhcB0UsmiRMCR+Bii5iu0RjtwJV55IhlLJ4K39pd0ku+eE4WRgqrLLW2Q==",
       "requires": {
         "@adraffy/ens-normalize": "1.9.2",
         "@noble/hashes": "1.1.2",
diff --git a/package.json b/package.json
index d29dd11af..2b1ed7736 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "cors": "^2.8.5",
     "directory-tree": "^3.5.1",
     "dotenv": "^8.2.0",
-    "ethers": "^6.6.2",
+    "ethers": "^6.6.5",
     "express": "^4.17.1",
     "express-fileupload": "^1.4.0",
     "express-oauth2-jwt-bearer": "^1.5.0",
diff --git a/packages/lib-sourcify/package-lock.json b/packages/lib-sourcify/package-lock.json
index 3c4c41cb8..918f9a166 100644
--- a/packages/lib-sourcify/package-lock.json
+++ b/packages/lib-sourcify/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@ethereum-sourcify/lib-sourcify",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@ethereum-sourcify/lib-sourcify",
-      "version": "1.1.2",
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
         "@ethereum-sourcify/bytecode-utils": "*",
@@ -19,7 +19,7 @@
         "@fairdatasociety/bmt-js": "^2.0.1",
         "abitype": "0.8.0",
         "bs58": "^5.0.0",
-        "ethers": "^6.6.2",
+        "ethers": "^6.6.5",
         "http-status-codes": "^2.2.0",
         "isomorphic-fetch": "^3.0.0",
         "jszip": "^3.10.1",
@@ -58,7 +58,7 @@
     },
     "../bytecode-utils": {
       "name": "@ethereum-sourcify/bytecode-utils",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "MIT",
       "dependencies": {
         "@ethersproject/bytes": "^5.7.0",
@@ -10627,7 +10627,9 @@
       }
     },
     "node_modules/ethers": {
-      "version": "6.6.2",
+      "version": "6.6.5",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.6.5.tgz",
+      "integrity": "sha512-Tc3HXzI0UJ9EhPp6E0fntkgMIA2//rhcB0UsmiRMCR+Bii5iu0RjtwJV55IhlLJ4K39pd0ku+eE4WRgqrLLW2Q==",
       "funding": [
         {
           "type": "individual",
@@ -10638,7 +10640,6 @@
           "url": "https://www.buymeacoffee.com/ricmoo"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "@adraffy/ens-normalize": "1.9.2",
         "@noble/hashes": "1.1.2",
@@ -22685,7 +22686,9 @@
       }
     },
     "ethers": {
-      "version": "6.6.2",
+      "version": "6.6.5",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.6.5.tgz",
+      "integrity": "sha512-Tc3HXzI0UJ9EhPp6E0fntkgMIA2//rhcB0UsmiRMCR+Bii5iu0RjtwJV55IhlLJ4K39pd0ku+eE4WRgqrLLW2Q==",
       "requires": {
         "@adraffy/ens-normalize": "1.9.2",
         "@noble/hashes": "1.1.2",
diff --git a/packages/lib-sourcify/package.json b/packages/lib-sourcify/package.json
index 7bbcf99bf..a2b1fdbf5 100644
--- a/packages/lib-sourcify/package.json
+++ b/packages/lib-sourcify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ethereum-sourcify/lib-sourcify",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Library for Sourcify's contract verification methods, contract validation, types, and interfaces.",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -52,7 +52,7 @@
     "@fairdatasociety/bmt-js": "^2.0.1",
     "abitype": "0.8.0",
     "bs58": "^5.0.0",
-    "ethers": "^6.6.2",
+    "ethers": "^6.6.5",
     "http-status-codes": "^2.2.0",
     "isomorphic-fetch": "^3.0.0",
     "jszip": "^3.10.1",
diff --git a/packages/lib-sourcify/src/lib/SourcifyChain.ts b/packages/lib-sourcify/src/lib/SourcifyChain.ts
index 9f6f32615..fd09e344a 100644
--- a/packages/lib-sourcify/src/lib/SourcifyChain.ts
+++ b/packages/lib-sourcify/src/lib/SourcifyChain.ts
@@ -10,7 +10,7 @@ import { logInfo, logWarn } from './logger';
 
 const RPC_TIMEOUT = process.env.RPC_TIMEOUT
   ? parseInt(process.env.RPC_TIMEOUT)
-  : 5000;
+  : 10 * 1000;
 
 // It is impossible to get the url from the Provider for logging purposes
 interface JsonRpcProviderWithUrl extends JsonRpcProvider {
@@ -192,7 +192,7 @@ export default class SourcifyChain {
       } catch (err) {
         if (err instanceof Error) {
           logWarn(
-            `Can't fetch block ${blockNumber} from RPC ${provider.url} and chain ${this.chainId}`
+            `Can't fetch block ${blockNumber} from RPC ${provider.url} and chain ${this.chainId}, error: ${err.message}`
           );
           continue;
         } else {