diff --git a/README b/README
index 0a1c978..73c9dce 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Calcite Avatica release 1.21.0
+Apache Calcite Avatica release 1.22.0
 
 # Overview
 This is a source or binary distribution of Avatica, a framework for
diff --git a/gradle.properties b/gradle.properties
index b43302b..7e7456a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@
 # This is version for Calcite Avatica itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-calcite.avatica.version=1.21.0
+calcite.avatica.version=1.22.0
 
 # The options below configures the use of local clone (e.g. testing development versions)
 # You can pass un-comment it, or pass option -PlocalReleasePlugins, or -PlocalReleasePlugins=<path>
diff --git a/site/_docs/docker_images.md b/site/_docs/docker_images.md
index 07223c4..41a7d77 100644
--- a/site/_docs/docker_images.md
+++ b/site/_docs/docker_images.md
@@ -70,22 +70,22 @@
 exposing an Avatica server configured against a "real" PostgreSQL database.
 
 All of the `Dockerfile` and `docker-compose.yml` files are conveniently provided in an archive for
-each release. Here is the layout for release 1.21.0:
+each release. Here is the layout for release 1.22.0:
 
 ```
-avatica-docker-1.21.0/
-avatica-docker-1.21.0/hypersql/
-avatica-docker-1.21.0/mysql/
-avatica-docker-1.21.0/postgresql/
-avatica-docker-1.21.0/Dockerfile
-avatica-docker-1.21.0/hypersql/build.sh
-avatica-docker-1.21.0/hypersql/Dockerfile
-avatica-docker-1.21.0/mysql/build.sh
-avatica-docker-1.21.0/mysql/docker-compose.yml
-avatica-docker-1.21.0/mysql/Dockerfile
-avatica-docker-1.21.0/postgresql/build.sh
-avatica-docker-1.21.0/postgresql/docker-compose.yml
-avatica-docker-1.21.0/postgresql/Dockerfile
+avatica-docker-1.22.0/
+avatica-docker-1.22.0/hypersql/
+avatica-docker-1.22.0/mysql/
+avatica-docker-1.22.0/postgresql/
+avatica-docker-1.22.0/Dockerfile
+avatica-docker-1.22.0/hypersql/build.sh
+avatica-docker-1.22.0/hypersql/Dockerfile
+avatica-docker-1.22.0/mysql/build.sh
+avatica-docker-1.22.0/mysql/docker-compose.yml
+avatica-docker-1.22.0/mysql/Dockerfile
+avatica-docker-1.22.0/postgresql/build.sh
+avatica-docker-1.22.0/postgresql/docker-compose.yml
+avatica-docker-1.22.0/postgresql/Dockerfile
 ```
 
 #### Running
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 02e1997..25c80bc 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -28,6 +28,33 @@
 Downloads are available on the
 [downloads page]({{ site.baseurl }}/downloads/avatica.html).
 
+## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.22.0">1.22.0</a> / 2022-07-XX
+{: #v1-22-0}
+
+Apache Calcite Avatica 1.22.0 is a maintenance release to resolve `CVE-2022-36364`: Apache Calcite Avatica JDBC driver
+`httpclient_impl` connection property can be used as an RCE vector. Users of previous versions of Avatica MUST upgrade
+to mitigate this vulnerability.
+
+Compatibility: This release is tested
+on Linux, macOS, Microsoft Windows;
+using Oracle JDK 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18;
+using IBM Java 8;
+Guava versions 14.0.1 to 31.1-jre;
+other software versions as specified in `gradle.properties`.
+
+Contributors to this release:
+Francis Chuang (Release Manager),
+Ruben Quesada Lopez
+
+Features and bug fixes
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-5218">CALCITE-5218</a>]
+  Verify HTTP client class before instantiating it
+
+Build and tests
+
+* Checkout release svn repository when promoting a release using the docker script
+
 ## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.21.0">1.21.0</a> / 2022-05-08
 {: #v1-21-0}
 
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 3e6ee02..a7d4359 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -43,8 +43,8 @@
 then build using Gradle:
 
 {% highlight bash %}
-$ tar xvfz apache-calcite-avatica-1.21.0-src.tar.gz
-$ cd apache-calcite-avatica-1.21.0-src
+$ tar xvfz apache-calcite-avatica-1.22.0-src.tar.gz
+$ cd apache-calcite-avatica-1.22.0-src
 $ gradle build
 {% endhighlight %}