diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85d2e60c4e..a0e5883702 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Changelog
 
+## v2.3.1 (2021-06-08)
+
+### Features
+
+* **dns**: add dns commands ([#1879](https://github.com/scaleway/scaleway-cli/pull/1879))
+* **instance**: add a generated name for create volume ([#1917](https://github.com/scaleway/scaleway-cli/pull/1917))
+* **instance**: add attach/detach ip commands ([#1911](https://github.com/scaleway/scaleway-cli/pull/1911))
+* **instance**: add support for instances with no local volumes reqs ([#1840](https://github.com/scaleway/scaleway-cli/pull/1840))
+* **instance**: import file for cloud-init ([#1525](https://github.com/scaleway/scaleway-cli/pull/1525))
+* **iot**: Add name generator for iot route create ([#1895](https://github.com/scaleway/scaleway-cli/pull/1895))
+* **iot**: add route update method ([#1873](https://github.com/scaleway/scaleway-cli/pull/1873))
+* **iot**: add support for get-ca command ([#1863](https://github.com/scaleway/scaleway-cli/pull/1863))
+* **k8s**: add kilo CNI ([#1916](https://github.com/scaleway/scaleway-cli/pull/1916))
+* **k8s**: deprecate dashboard field ([#1857](https://github.com/scaleway/scaleway-cli/pull/1857))
+* **lb**: switch CLI to ZonedApi ([#1893](https://github.com/scaleway/scaleway-cli/pull/1893))
+* **rdb**: add support for snapshots and block volume storage ([#1875](https://github.com/scaleway/scaleway-cli/pull/1875))
+* add banner about scw feedback bug when a panic occurs ([#1813](https://github.com/scaleway/scaleway-cli/pull/1813))
+
+### Fixes
+
+* **instance**: use right zone for all calls in server-type ([#1883](https://github.com/scaleway/scaleway-cli/pull/1883))
+* ensure we upgrade the latest tag of the CLI in dockerhub ([#1912](https://github.com/scaleway/scaleway-cli/pull/1912))
+
+### Others
+
+* **chore - deps**: bump hosted-git-info in /scripts/release ([#1906](https://github.com/scaleway/scaleway-cli/pull/1906))
+* **chore**: add a test to ensure documentation is generated ([#1838](https://github.com/scaleway/scaleway-cli/pull/1838))
+* **chore**: bump sdk ([#1864](https://github.com/scaleway/scaleway-cli/pull/1864))
+* **chore**: cleanup after v2.3.0 release ([#1812](https://github.com/scaleway/scaleway-cli/pull/1812))
+* **chore**: make test fail if docs is not up to date ([#1913](https://github.com/scaleway/scaleway-cli/pull/1913))
+* **dns**: add support for enum marshall status for certificate ([#1881](https://github.com/scaleway/scaleway-cli/pull/1881))
+* **doc**: fix and update Docker documentation ([#1887](https://github.com/scaleway/scaleway-cli/pull/1887))
+
+
+
 ## v2.3.0 (2021-03-10)
 
 ### Features
diff --git a/README.md b/README.md
index baf022b66d..e4c8894327 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ echo $PATH
 /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 # Download the release from github
-curl -o /usr/local/bin/scw -L "https://github.com/scaleway/scaleway-cli/releases/download/v2.3.0/scw-2.3.0-darwin-x86_64"
+curl -o /usr/local/bin/scw -L "https://github.com/scaleway/scaleway-cli/releases/download/v2.3.1/scw-2.3.1-darwin-x86_64"
 
 # Allow executing file as program
 chmod +x /usr/local/bin/scw
@@ -78,7 +78,7 @@ scw init
 
 ```bash
 # Download the release from github
-sudo curl -o /usr/local/bin/scw -L "https://github.com/scaleway/scaleway-cli/releases/download/v2.3.0/scw-2.3.0-linux-x86_64"
+sudo curl -o /usr/local/bin/scw -L "https://github.com/scaleway/scaleway-cli/releases/download/v2.3.1/scw-2.3.1-linux-x86_64"
 
 # Allow executing file as program
 sudo chmod +x /usr/local/bin/scw
@@ -89,7 +89,7 @@ scw init
 
 #### Windows
 
-You can download the last release here: https://github.com/scaleway/scaleway-cli/releases/download/v2.3.0/scw-2.3.0-windows-x86_64.exe<br/>
+You can download the last release here: https://github.com/scaleway/scaleway-cli/releases/download/v2.3.1/scw-2.3.1-windows-x86_64.exe<br/>
 [This official guide](https://docs.microsoft.com/en-us/previous-versions/office/developer/sharepoint-2010/ee537574%28v%3Doffice.14%29) explains how to add tools to your `PATH`.
 
 <!-- TODO:
@@ -100,7 +100,7 @@ First, download [the `.deb` file](https://github.com/scaleway/scaleway-cli/relea
 
 ```bash
 export ARCH=amd64 # Can be 'amd64', 'arm', 'arm64' or 'i386'
-wget "https://github.com/scaleway/scaleway-cli/releases/download/v2.3.0/scw-v2.3.0-${ARCH}.deb" -O /tmp/scw.deb
+wget "https://github.com/scaleway/scaleway-cli/releases/download/v2.3.1/scw-v2.3.1-${ARCH}.deb" -O /tmp/scw.deb
 ```
 
 Then, run the installation and remove the `.deb` file:
@@ -126,7 +126,7 @@ docker run scaleway/cli version
 You can use the CLI as you would run any Docker image:
 
 ```sh
-docker run -i --rm scaleway/cli:v2.3.0
+docker run -i --rm scaleway/cli:v2.3.1
 ```
 
 See more in-depth information about running the CLI in Docker [here](./docs/docker.md)
diff --git a/cmd/scw/main.go b/cmd/scw/main.go
index 8ff594ec46..8d645d974d 100644
--- a/cmd/scw/main.go
+++ b/cmd/scw/main.go
@@ -15,7 +15,7 @@ import (
 
 var (
 	// Version is updated manually
-	Version = "v2.3.0+dev" // ${BUILD_VERSION:-`git describe --tags --dirty --always`}"
+	Version = "v2.3.1" // ${BUILD_VERSION:-`git describe --tags --dirty --always`}"
 
 	// These are initialized by the build script