diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5060d25ed0..c1f0d29e5c 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -8,7 +8,7 @@ on:
     branches:
       - master
 env:
-  SOLANA_CLI_VERSION: 1.8.0
+  SOLANA_CLI_VERSION: 1.8.5
   NODE_VERSION: 17.0.1
 
 jobs:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0d49a396e..c6e74f47d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ incremented for features.
 
 ## [Unreleased]
 
+### Features
+
+* lang,ts,ci,cli,docs: update solana toolchain([#1133](https://github.com/project-serum/anchor/pull/1133))
+
 ## [0.19.0] - 2021-12-08
 
 ### Fixes
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a89538d2dd..e1f652b1f7 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -24,9 +24,9 @@ shellexpand = "2.1.0"
 toml = "0.5.8"
 semver = "1.0.4"
 serde = { version = "1.0.122", features = ["derive"] }
-solana-sdk = "1.8.0"
-solana-program = "1.8.0"
-solana-client = "1.8.0"
+solana-sdk = "1.8.5"
+solana-program = "1.8.5"
+solana-client = "1.8.5"
 serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] }
 dirs = "3.0"
 heck = "0.3.1"
diff --git a/docker/Makefile b/docker/Makefile
index 884394fc9f..66ae31fac2 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -6,7 +6,7 @@ ANCHOR_CLI=v$(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/[\"]/, "", $$2); print
 #
 # Solana toolchain.
 #
-SOLANA_CLI=v1.8.0
+SOLANA_CLI=v1.8.5
 #
 # Build version should match the Anchor cli version.
 #
diff --git a/docs/src/getting-started/installation.md b/docs/src/getting-started/installation.md
index a27230d860..a99d8243d2 100644
--- a/docs/src/getting-started/installation.md
+++ b/docs/src/getting-started/installation.md
@@ -18,7 +18,7 @@ rustup component add rustfmt
 See the solana [docs](https://docs.solana.com/cli/install-solana-cli-tools) for installation instructions. On macOS and Linux,
 
 ```bash
-sh -c "$(curl -sSfL https://release.solana.com/v1.8.0/install)"
+sh -c "$(curl -sSfL https://release.solana.com/v1.8.5/install)"
 ```
 
 ## Install Yarn
diff --git a/lang/Cargo.toml b/lang/Cargo.toml
index 442221ea19..ec659e3a89 100644
--- a/lang/Cargo.toml
+++ b/lang/Cargo.toml
@@ -36,6 +36,6 @@ anchor-derive-accounts = { path = "./derive/accounts", version = "0.19.0" }
 base64 = "0.13.0"
 borsh = "0.9"
 bytemuck = "1.4.0"
-solana-program = "1.8.0"
+solana-program = "1.8.5"
 thiserror = "1.0.20"
 bincode = "1.3.3"
diff --git a/spl/Cargo.toml b/spl/Cargo.toml
index 39060e7528..cf34ed215b 100644
--- a/spl/Cargo.toml
+++ b/spl/Cargo.toml
@@ -19,6 +19,6 @@ dex = ["serum_dex"]
 [dependencies]
 anchor-lang = { path = "../lang", version = "0.19.0", features = ["derive"] }
 serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
-solana-program = "1.8.0"
+solana-program = "1.8.5"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 spl-associated-token-account = { version = "1.0.3", features = ["no-entrypoint"] }