diff --git a/bitnami/etcd/3.5/debian-11/Dockerfile b/bitnami/etcd/3.5/debian-11/Dockerfile
index e8b20e38c46e..ef607e9083f4 100644
--- a/bitnami/etcd/3.5/debian-11/Dockerfile
+++ b/bitnami/etcd/3.5/debian-11/Dockerfile
@@ -4,7 +4,8 @@ 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.5.6-debian-11-r17" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.ref.name="3.5.6-debian-11-r18" \
       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.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index f3bc7568bfa5..ad2f0eee48df 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -31,7 +31,7 @@ get_sematic_version () {
 
         while [[ $i -lt $n ]]; do
             if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
-                version_sections[$j]=${BASH_REMATCH[$i]}
+                version_sections[j]="${BASH_REMATCH[$i]}"
                 ((j++))
             fi
             ((i++))
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
index 0df8e3cb7813..1c481f3ffd16 100644
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
@@ -314,7 +314,7 @@ etcd_store_member_id() {
     etcd_start_bg
     read -r -a extra_flags <<<"$(etcdctl_auth_flags)"
     is_boolean_yes "$ETCD_ON_K8S" && extra_flags+=("--endpoints=$(etcdctl_get_endpoints)")
-    if retry_while "etcdctl ${extra_flags[*]} member list" >/dev/null 2>&1; then
+    if retry_while "etcdctl ${extra_flags[*]:-} member list" >/dev/null 2>&1; then
         while is_empty_value "$member_id"; do
             read -r -a advertised_array <<<"$(tr ',;' ' ' <<<"$ETCD_ADVERTISE_CLIENT_URLS")"
             member_id="$(etcdctl "${extra_flags[@]}" member list | grep -w "${advertised_array[0]}" | awk -F "," '{ print $1}' || true)"