diff --git a/Makefile b/Makefile
index e184ba2..81960de 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,8 @@ pgbackrest-build:
 			--build-arg BUILD=$(BUILD)										\
 			--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION)			\
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"				\
-			--build-arg PGVERSION=$(PGVERSION)
+			--build-arg PGVERSION=$(PGVERSION)								\
+			--build-arg ARCH=$(ARCH)
 
 pgbackrest: pgbackrest-build;
 			
diff --git a/docker/pgbackrest/Dockerfile b/docker/pgbackrest/Dockerfile
index e7cd27b..2964970 100644
--- a/docker/pgbackrest/Dockerfile
+++ b/docker/pgbackrest/Dockerfile
@@ -11,6 +11,7 @@ ARG PGBACKREST_VERSION
 ARG PGVERSION
 ARG OLD_PG_VERSIONS
 ARG PG_SUPPORTED_VERSIONS="$OLD_PG_VERSIONS $PGVERSION"
+ARG ARCH
 
 RUN ${PACKAGER} -y install --nodocs  \
 		--setopt=skip_missing_names_on_install=False \
@@ -37,7 +38,7 @@ RUN rm /etc/pgbackrest.conf
 RUN rm -rf /var/spool/pgbackrest
 
 # Add kubectl
-RUN curl -LO https://dl.k8s.io/release/v1.30.0/bin/linux/amd64/kubectl && chmod +x kubectl 
+RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${ARCH}/kubectl" && chmod +x kubectl 
 
 RUN mkdir -p /tmp/pgsql && cp -r /usr/pgsql* /tmp/pgsql
 RUN mkdir -p /tmp/pg && cp -r /usr/bin/pg* /tmp/pg
diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
index 65d722c..a0e2157 100644
--- a/docker/postgres/Dockerfile
+++ b/docker/postgres/Dockerfile
@@ -58,7 +58,7 @@ RUN ${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setop
 		&& ${PACKAGER} -y clean all;
 
 # install etcdctl
-RUN ETCDVERSION=3.5.1 \
+RUN ETCDVERSION=3.5.15 \
     && curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-${ARCH}.tar.gz | tar xz -C /bin --strip=1 --wildcards --no-anchored --no-same-owner etcdctl etcd;
 
 ENV PATHBACKUP = $PATH