diff --git a/integration-tests/testconfig/default.toml b/integration-tests/testconfig/default.toml
index 1d4178f13..4c09a8ee2 100644
--- a/integration-tests/testconfig/default.toml
+++ b/integration-tests/testconfig/default.toml
@@ -38,7 +38,7 @@ inside_k8 = false
 network = "localnet"
 user = "default"
 stateful_db = false
-devnet_image = "anzaxyz/agave:v2.1.21"
+devnet_image = "anzaxyz/agave:v2.3.9"
 
 [OCR2]
 node_count = 6
diff --git a/scripts/install-solana-ci.sh b/scripts/install-solana-ci.sh
index 1e928a8fc..bc44b33c5 100755
--- a/scripts/install-solana-ci.sh
+++ b/scripts/install-solana-ci.sh
@@ -2,5 +2,5 @@
 
 set -euxo pipefail
 
-sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.21/install)"
+sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.9/install)"
 echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$PATH" >> $GITHUB_ENV
diff --git a/scripts/setup-localnet/localnet.sh b/scripts/setup-localnet/localnet.sh
index 2b80a094c..1331ed11f 100755
--- a/scripts/setup-localnet/localnet.sh
+++ b/scripts/setup-localnet/localnet.sh
@@ -6,7 +6,7 @@ cpu_struct="linux";
 # Clean up first
 bash "$(dirname -- "$0";)/localnet.down.sh"
 
-container_version=v2.1.21
+container_version=v2.3.9
 container_name="chainlink-solana.test-validator"
 
 echo "Starting $container_name@$container_version"
diff --git a/solana.nix b/solana.nix
index 428602f3d..aa88dc870 100644
--- a/solana.nix
+++ b/solana.nix
@@ -5,7 +5,7 @@
 
 # Solana integration
 let
-  version = "v2.1.21";
+  version = "v2.3.9";
   getBinDerivation =
     {
       name,
@@ -37,14 +37,14 @@ let
       name = "solana-cli-x86_64-linux";
       filename = "solana-release-x86_64-unknown-linux-gnu.tar.bz2";
       ### BEGIN_LINUX_SHA256 ###
-      sha256 = "sha256-/DQY80nWvvqJxbDdQ4gp8zqfQCyNU0I7G7HjTcCbjvE=";
+      sha256 = "sha256-LGqFlSqEU7elv3qsKEmkjAk3uhKnY9C8owZh57ff04U=";
       ### END_LINUX_SHA256 ###
     };
     aarch64-apple-darwin = getBinDerivation {
       name = "solana-cli-aarch64-apple-darwin";
       filename = "solana-release-aarch64-apple-darwin.tar.bz2";
       ### BEGIN_DARWIN_SHA256 ###
-      sha256 = "sha256-MHGDdpERzENTAB1iaHNcAF1m1LSRpEr2cF1GU2xfuLE=";
+      sha256 = "sha256-8/KNv6nRWay43OhrLwyHqO+Pm5lUzGVQWaDKlgLQu40=";
       ### END_DARWIN_SHA256 ###
     };
   };