diff --git a/bitnami/etcd/3.4/debian-11/Dockerfile b/bitnami/etcd/3.4/debian-11/Dockerfile
index a8cb0671c486..6f627f62d018 100644
--- a/bitnami/etcd/3.4/debian-11/Dockerfile
+++ b/bitnami/etcd/3.4/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="3.4.21-debian-11-r0" \
+      org.opencontainers.image.ref.name="3.4.21-debian-11-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/etcd" \
       org.opencontainers.image.title="etcd" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
index 20718e4ea936..81067889906c 100644
--- a/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
+++ b/bitnami/etcd/3.4/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
@@ -694,9 +694,15 @@ etcd_initialize() {
                 export ETCD_INITIAL_CLUSTER_STATE=existing
                 [[ -f "$ETCD_CONF_FILE" ]] && etcd_conf_write "initial-cluster-state" "$ETCD_INITIAL_CLUSTER_STATE"
                 read -r -a extra_flags <<<"$(etcdctl_auth_flags)"
-                is_boolean_yes "$ETCD_ON_K8S" && extra_flags+=("--endpoints=$(etcdctl_get_endpoints)")
                 extra_flags+=("--peer-urls=$ETCD_INITIAL_ADVERTISE_PEER_URLS")
-                etcdctl member update "$member_id" "${extra_flags[@]}"
+                if is_boolean_yes "$ETCD_ON_K8S"; then
+                    extra_flags+=("--endpoints=$(etcdctl_get_endpoints)")
+                    etcdctl member update "$member_id" "${extra_flags[@]}"
+                else
+                    etcd_start_bg
+                    etcdctl member update "$member_id" "${extra_flags[@]}"
+                    etcd_stop
+                fi
             else
                 info "Member ID wasn't properly stored, the member will try to join the cluster by it's own"
                 export ETCD_INITIAL_CLUSTER_STATE=existing
diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md
index 4dbe237a74f9..46e5c7f2bd83 100644
--- a/bitnami/etcd/README.md
+++ b/bitnami/etcd/README.md
@@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`3.5`, `3.5-debian-11`, `3.5.5`, `3.5.5-debian-11-r0`, `latest` (3.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.5/debian-11/Dockerfile)
-* [`3.4`, `3.4-debian-11`, `3.4.21`, `3.4.21-debian-11-r0` (3.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.4/debian-11/Dockerfile)
+* [`3.4`, `3.4-debian-11`, `3.4.21`, `3.4.21-debian-11-r1` (3.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.4/debian-11/Dockerfile)
 * [`3.3`, `3.3-debian-11`, `3.3.27`, `3.3.27-debian-11-r38` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/etcd/3.3/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).