diff --git a/bitnami/etcd/3/debian-10/Dockerfile b/bitnami/etcd/3/debian-10/Dockerfile
index 19a58ed368d4..0c094bd7318b 100644
--- a/bitnami/etcd/3/debian-10/Dockerfile
+++ b/bitnami/etcd/3/debian-10/Dockerfile
@@ -4,10 +4,10 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl gzip procps tar wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/etcd-3.4.9-0-linux-amd64-debian-10.tar.gz && \
-    echo "7fe33eb331b801d09ef496a243a09c8e298c6eb53763b1012f2897dcaeebab9a  /tmp/bitnami/pkg/cache/etcd-3.4.9-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/etcd-3.4.9-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/etcd-3.4.9-0-linux-amd64-debian-10.tar.gz
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/etcd-3.4.9-1-linux-amd64-debian-10.tar.gz && \
+    echo "92a5d9c3f05b69c1a43061edfec0cd9261e978dedc70a2dc43799d38e7aeaf7f  /tmp/bitnami/pkg/cache/etcd-3.4.9-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/etcd-3.4.9-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/etcd-3.4.9-1-linux-amd64-debian-10.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 
@@ -15,7 +15,7 @@ COPY rootfs /
 RUN mkdir -p /bitnami/etcd/data/ && chmod g+rwX /bitnami/etcd/data/
 RUN chmod g+rwX /opt/bitnami/etcd
 ENV BITNAMI_APP_NAME="etcd" \
-    BITNAMI_IMAGE_VERSION="3.4.9-debian-10-r21" \
+    BITNAMI_IMAGE_VERSION="3.4.9-debian-10-r22" \
     ETCDCTL_API="3" \
     ETCD_ADVERTISE_CLIENT_URLS="http://127.0.0.1:2379" \
     ETCD_DATA_DIR="/bitnami/etcd/data/" \
diff --git a/bitnami/etcd/3/debian-10/docker-compose.yml b/bitnami/etcd/3/debian-10/docker-compose.yml
index 5e4add43a294..563021b68be2 100644
--- a/bitnami/etcd/3/debian-10/docker-compose.yml
+++ b/bitnami/etcd/3/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   etcd:
-    image: bitnami/etcd:3
+    image: docker.io/bitnami/etcd:3-debian-10
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
     volumes:
diff --git a/bitnami/etcd/3/debian-10/rootfs/entrypoint.sh b/bitnami/etcd/3/debian-10/rootfs/entrypoint.sh
index b3d8f71ba127..7622a7de24be 100755
--- a/bitnami/etcd/3/debian-10/rootfs/entrypoint.sh
+++ b/bitnami/etcd/3/debian-10/rootfs/entrypoint.sh
@@ -31,6 +31,7 @@ if [[ ! -z "$ETCD_ROOT_PASSWORD" ]]; then
     ETCD_PID=$!
     sleep 3
     echo "$ETCD_ROOT_PASSWORD" | etcdctl user add root --interactive=false
+    etcdctl user grant-role root root
     etcdctl auth enable
     kill $ETCD_PID
     unset ETCD_ROOT_PASSWORD
diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md
index f27a8d663d54..0a8f4bff7cbf 100644
--- a/bitnami/etcd/README.md
+++ b/bitnami/etcd/README.md
@@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3-debian-10`, `3.4.9-debian-10-r21`, `3`, `3.4.9`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.9-debian-10-r21/3/debian-10/Dockerfile)
+* [`3-debian-10`, `3.4.9-debian-10-r22`, `3`, `3.4.9`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.9-debian-10-r22/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/etcd GitHub repo](https://github.com/bitnami/bitnami-docker-etcd).
 
diff --git a/bitnami/etcd/docker-compose-cluster.yml b/bitnami/etcd/docker-compose-cluster.yml
index bbc67304bcd3..9d77f2a1ae59 100644
--- a/bitnami/etcd/docker-compose-cluster.yml
+++ b/bitnami/etcd/docker-compose-cluster.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   etcd1:
-    image: bitnami/etcd:3
+    image: docker.io/bitnami/etcd:3-debian-10
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
       - ETCD_NAME=etcd1
@@ -14,7 +14,7 @@ services:
       - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
       - ETCD_INITIAL_CLUSTER_STATE=new
   etcd2:
-    image: bitnami/etcd:3
+    image: docker.io/bitnami/etcd:3-debian-10
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
       - ETCD_NAME=etcd2
@@ -26,7 +26,7 @@ services:
       - ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
       - ETCD_INITIAL_CLUSTER_STATE=new
   etcd3:
-    image: bitnami/etcd:3
+    image: docker.io/bitnami/etcd:3-debian-10
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
       - ETCD_NAME=etcd3
diff --git a/bitnami/etcd/docker-compose.yml b/bitnami/etcd/docker-compose.yml
index 5e4add43a294..563021b68be2 100644
--- a/bitnami/etcd/docker-compose.yml
+++ b/bitnami/etcd/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   etcd:
-    image: bitnami/etcd:3
+    image: docker.io/bitnami/etcd:3-debian-10
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
     volumes: