diff --git a/.solhint.json b/.solhint.json
index d11bf3f..2d5ddc4 100644
--- a/.solhint.json
+++ b/.solhint.json
@@ -9,6 +9,7 @@
     "named-parameters-mapping": "warn",
     "no-console": "off",
     "not-rely-on-time": "off",
-    "one-contract-per-file": "off"
+    "one-contract-per-file": "off",
+    "gas-custom-errors": "off"
   }
 }
diff --git a/scripts/E2ETestDeploy.s.sol b/scripts/E2ETestDeploy.s.sol
index 91ad363..5a7e63e 100644
--- a/scripts/E2ETestDeploy.s.sol
+++ b/scripts/E2ETestDeploy.s.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.28;
     This script is used for end-to-end testing with SP1_PROVER=network.
 */
 
-// solhint-disable gas-custom-errors,custom-errors
+// solhint-disable custom-errors
 
 import { stdJson } from "forge-std/StdJson.sol";
 import { Script } from "forge-std/Script.sol";
diff --git a/test/IbcIdentifiersTest.t.sol b/test/IbcIdentifiersTest.t.sol
index be60be0..075acbe 100644
--- a/test/IbcIdentifiersTest.t.sol
+++ b/test/IbcIdentifiersTest.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.28;
 
-// solhint-disable gas-custom-errors,max-line-length
+// solhint-disable max-line-length
 
 import { Test } from "forge-std/Test.sol";
 import { IBCIdentifiers } from "../src/utils/IBCIdentifiers.sol";