diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8555e8174..2edb2b531 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 16)
-set(VINEYARD_PATCH_VERSION 0)
+set(VINEYARD_PATCH_VERSION 1)
 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 22932403c..fa31a0e43 100644
--- a/charts/vineyard-operator/Chart.yaml
+++ b/charts/vineyard-operator/Chart.yaml
@@ -24,12 +24,12 @@ 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.16.0
+version: 0.16.1
 
 # 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.16.0
+appVersion: 0.16.1
 
 dependencies:
   - name: cert-manager
diff --git a/k8s/Dockerfile b/k8s/Dockerfile
index dc992486b..ac27a89f2 100644
--- a/k8s/Dockerfile
+++ b/k8s/Dockerfile
@@ -16,9 +16,8 @@ COPY k8s/ k8s/
 # Update the working directory
 WORKDIR /workspace/k8s
 
-RUN go mod download
-
 # Build
+RUN go mod download
 RUN go build -a -o vineyardctl cmd/main.go && \
     strip vineyardctl || true
 
diff --git a/k8s/Makefile b/k8s/Makefile
index 1e3c7ddbc..cdbdb816c 100644
--- a/k8s/Makefile
+++ b/k8s/Makefile
@@ -209,7 +209,7 @@ vendor:
 # Build the docker image
 .PHONY: docker-build
 docker-build:
-	cd .. &&\
+	cd .. && \
 	if docker build --help | grep -q load; then \
 		docker build --load -f k8s/Dockerfile . -t $(IMG); \
 	else \
@@ -217,7 +217,8 @@ docker-build:
 	fi
 
 docker-build-push-multi-arch:
-	docker buildx build . -t $(IMG) --platform linux/amd64,linux/arm64 --push
+	cd .. && \
+	docker buildx build -f k8s/Dockerfile . -t $(IMG) --platform linux/amd64,linux/arm64 --push
 
 # Push the docker image
 .PHONY: docker-push
diff --git a/k8s/cmd/main.go b/k8s/cmd/main.go
index 0eee7dfeb..ab6afdafb 100644
--- a/k8s/cmd/main.go
+++ b/k8s/cmd/main.go
@@ -46,7 +46,7 @@ var cmdLong = util.LongDesc(`
 
 var cmd = &cobra.Command{
 	Use:     "vineyardctl [command]",
-	Version: "v0.16.0",
+	Version: "v0.16.1",
 	Short:   "vineyardctl is the command-line tool for interact with the Vineyard Operator.",
 	Long:    cmdLong,
 }
diff --git a/setup.cfg b/setup.cfg
index e476c6190..152ca972e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-version = 0.16.0
+version = 0.16.1
 
 [pycodestyle]
 max_line_length = 88
diff --git a/src/common/util/config.h b/src/common/util/config.h
index 2ac8d9e11..c3f098e8f 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 16
-#define VINEYARD_VERSION_PATCH 0
+#define VINEYARD_VERSION_PATCH 1
 
 #define VINEYARD_VERSION                                              \
   ((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \
       VINEYARD_VERSION_PATCH
-#define VINEYARD_VERSION_STRING "0.16.0"
+#define VINEYARD_VERSION_STRING "0.16.1"
 
 #endif  // SRC_COMMON_UTIL_CONFIG_H_
diff --git a/thirdparty/etcd-cpp-apiv3 b/thirdparty/etcd-cpp-apiv3
index 2c0d824eb..5e2884f36 160000
--- a/thirdparty/etcd-cpp-apiv3
+++ b/thirdparty/etcd-cpp-apiv3
@@ -1 +1 @@
-Subproject commit 2c0d824ebedc725e984d219a32a5d6ff3e37b041
+Subproject commit 5e2884f36276e44f683fa02fca39807716fdbc16