diff --git a/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol b/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol
index 7073cdd7e5c..f3cb80cd970 100644
--- a/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol
+++ b/contracts/src/v0.8/ccip/test/rateLimiter/MultiAggregateRateLimiter.t.sol
@@ -520,14 +520,14 @@ contract MultiAggregateRateLimiter_updateRateLimitTokens is MultiAggregateRateLi
         remoteChainSelector: CHAIN_SELECTOR_1,
         localToken: s_destTokens[0]
       }),
-      remoteToken: abi.encodePacked(s_sourceTokens[0])
+      remoteToken: abi.encode(s_sourceTokens[0])
     });
     adds[1] = MultiAggregateRateLimiter.RateLimitTokenArgs({
       localTokenArgs: MultiAggregateRateLimiter.LocalRateLimitToken({
         remoteChainSelector: CHAIN_SELECTOR_2,
         localToken: s_destTokens[1]
       }),
-      remoteToken: abi.encodePacked(s_sourceTokens[1])
+      remoteToken: abi.encode(s_sourceTokens[1])
     });
 
     for (uint256 i = 0; i < adds.length; ++i) {
@@ -769,7 +769,7 @@ contract MultiAggregateRateLimiter_onInboundMessage is MultiAggregateRateLimiter
           localToken: s_destTokens[i]
         }),
         // Create a remote token address that is different from CHAIN_SELECTOR_1
-        remoteToken: abi.encodePacked(uint256(uint160(s_sourceTokens[i])) + type(uint160).max + 1)
+        remoteToken: abi.encode(uint256(uint160(s_sourceTokens[i])) + type(uint160).max + 1)
       });
     }
     s_rateLimiter.updateRateLimitTokens(new MultiAggregateRateLimiter.LocalRateLimitToken[](0), tokensToAdd);
@@ -818,7 +818,7 @@ contract MultiAggregateRateLimiter_onInboundMessage is MultiAggregateRateLimiter
         localToken: s_destTokens[0]
       }),
       // Create a remote token address that is different from CHAIN_SELECTOR_1
-      remoteToken: abi.encodePacked(uint256(uint160(s_sourceTokens[0])) + type(uint160).max + 1)
+      remoteToken: abi.encode(uint256(uint160(s_sourceTokens[0])) + type(uint160).max + 1)
     });
     s_rateLimiter.updateRateLimitTokens(new MultiAggregateRateLimiter.LocalRateLimitToken[](0), tokensToAdd);
 
@@ -915,7 +915,7 @@ contract MultiAggregateRateLimiter_onOutboundMessage is MultiAggregateRateLimite
           remoteChainSelector: CHAIN_SELECTOR_1,
           localToken: s_sourceTokens[i]
         }),
-        remoteToken: abi.encodePacked(bytes20(s_destTokenBySourceToken[s_sourceTokens[i]]))
+        remoteToken: abi.encode(bytes20(s_destTokenBySourceToken[s_sourceTokens[i]]))
       });
 
       Internal.PriceUpdates memory priceUpdates =
@@ -1003,7 +1003,7 @@ contract MultiAggregateRateLimiter_onOutboundMessage is MultiAggregateRateLimite
           localToken: s_sourceTokens[i]
         }),
         // Create a remote token address that is different from CHAIN_SELECTOR_1
-        remoteToken: abi.encodePacked(
+        remoteToken: abi.encode(
           uint256(uint160(s_destTokenBySourceToken[s_sourceTokens[i]])) + type(uint160).max + 1
           )
       });
@@ -1054,7 +1054,7 @@ contract MultiAggregateRateLimiter_onOutboundMessage is MultiAggregateRateLimite
         localToken: s_sourceTokens[0]
       }),
       // Create a remote token address that is different from CHAIN_SELECTOR_1
-      remoteToken: abi.encodePacked(uint256(uint160(s_destTokenBySourceToken[s_sourceTokens[0]])) + type(uint160).max + 1)
+      remoteToken: abi.encode(uint256(uint160(s_destTokenBySourceToken[s_sourceTokens[0]])) + type(uint160).max + 1)
     });
     s_rateLimiter.updateRateLimitTokens(new MultiAggregateRateLimiter.LocalRateLimitToken[](0), tokensToAdd);
 
diff --git a/go.mod b/go.mod
index fc89fbb06c3..de45b53d443 100644
--- a/go.mod
+++ b/go.mod
@@ -74,7 +74,7 @@ require (
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chain-selectors v1.0.21
 	github.com/smartcontractkit/chainlink-automation v1.0.4
-	github.com/smartcontractkit/chainlink-ccip v0.0.0-20240812165928-f1cc95338422
+	github.com/smartcontractkit/chainlink-ccip v0.0.0-20240811212735-84d06e9a5fc8
 	github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240718160222-2dc0c8136bfa
diff --git a/go.sum b/go.sum
index 5aa0189250f..e95dd22be21 100644
--- a/go.sum
+++ b/go.sum
@@ -1027,6 +1027,8 @@ github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1Wo
 github.com/smartcontractkit/chain-selectors v1.0.21/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
+github.com/smartcontractkit/chainlink-ccip v0.0.0-20240811212735-84d06e9a5fc8 h1:LToLsAcgoIkt/CK1I68QhZEMwpLRmTUsKf0fLsEwyTg=
+github.com/smartcontractkit/chainlink-ccip v0.0.0-20240811212735-84d06e9a5fc8/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20240812165928-f1cc95338422 h1:XKEmg6dOkCsyNcW3R+IhhrUYdVJTKirLL2sCCgzRWjU=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20240812165928-f1cc95338422/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo=
 github.com/smartcontractkit/chainlink-common v0.2.1-0.20240717132349-ee5af9b79834 h1:pTf4xdcmiWBqWZ6rTy2RMTDBzhHk89VC1pM7jXKQztI=