diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dc661de..b335fe90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3)
 
 set(VINEYARD_MAJOR_VERSION 0)
 set(VINEYARD_MINOR_VERSION 21)
-set(VINEYARD_PATCH_VERSION 4)
+set(VINEYARD_PATCH_VERSION 5)
 set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION})
 
 message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.")
diff --git a/charts/vineyard-operator/Chart.yaml b/charts/vineyard-operator/Chart.yaml
index 398b6733..8da9f2ae 100644
--- a/charts/vineyard-operator/Chart.yaml
+++ b/charts/vineyard-operator/Chart.yaml
@@ -24,10 +24,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.21.4
+version: 0.21.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.21.4
+appVersion: 0.21.5
 
diff --git a/k8s/cmd/main.go b/k8s/cmd/main.go
index 2f63d796..489367b0 100644
--- a/k8s/cmd/main.go
+++ b/k8s/cmd/main.go
@@ -48,7 +48,7 @@ var cmdLong = util.LongDesc(`
 
 var cmd = &cobra.Command{
 	Use:     "vineyardctl [command]",
-	Version: "v0.21.4",
+	Version: "v0.21.5",
 	Short:   "vineyardctl is the command-line tool for interact with the Vineyard Operator.",
 	Long:    cmdLong,
 }
diff --git a/setup.cfg b/setup.cfg
index 47a5ac0a..62daca31 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-version = 0.21.4
+version = 0.21.5
 
 [pycodestyle]
 max_line_length = 88
diff --git a/src/common/util/config.h b/src/common/util/config.h
index dd25369b..86e6911f 100644
--- a/src/common/util/config.h
+++ b/src/common/util/config.h
@@ -18,11 +18,11 @@ limitations under the License.
 
 #define VINEYARD_VERSION_MAJOR 0
 #define VINEYARD_VERSION_MINOR 21
-#define VINEYARD_VERSION_PATCH 4
+#define VINEYARD_VERSION_PATCH 5
 
 #define VINEYARD_VERSION                                              \
   ((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \
       VINEYARD_VERSION_PATCH
-#define VINEYARD_VERSION_STRING "0.21.4"
+#define VINEYARD_VERSION_STRING "0.21.5"
 
 #endif  // SRC_COMMON_UTIL_CONFIG_H_
diff --git a/thirdparty/etcd-cpp-apiv3 b/thirdparty/etcd-cpp-apiv3
index ba621638..c911c83c 160000
--- a/thirdparty/etcd-cpp-apiv3
+++ b/thirdparty/etcd-cpp-apiv3
@@ -1 +1 @@
-Subproject commit ba6216385fc332b23d95683966824c2b86c2474e
+Subproject commit c911c83c53ef49084d9b7be6ae3afe7b605f4100