diff --git a/Makefile b/Makefile
index 637d16b..a0283a3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,21 +17,21 @@
 
 IMAGE_NAME := fluent/fluentd
 X86_IMAGES := \
-	v1.17/alpine:v1.17.0-1.1,v1.17-1,edge \
-	v1.17/debian:v1.17.0-debian-amd64-1.1,v1.17-debian-amd64-1,edge-debian-amd64
+	v1.17/alpine:v1.17.1-1.0,v1.17-1,edge \
+	v1.17/debian:v1.17.1-debian-amd64-1.0,v1.17-debian-amd64-1,edge-debian-amd64
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Define images for running on ARM platforms
 ARM_IMAGES := \
-	v1.17/armhf/debian:v1.17.0-debian-armhf-1.1,v1.17-debian-armhf-1,edge-debian-armhf \
+	v1.17/armhf/debian:v1.17.1-debian-armhf-1.0,v1.17-debian-armhf-1,edge-debian-armhf \
 
 # Define images for running on ARM64 platforms
 ARM64_IMAGES := \
-	v1.17/arm64/debian:v1.17.0-debian-arm64-1.1,v1.16-debian-arm64-1,edge-debian-arm64 \
+	v1.17/arm64/debian:v1.17.1-debian-arm64-1.0,v1.16-debian-arm64-1,edge-debian-arm64 \
 
 WINDOWS_IMAGES := \
-	v1.17/windows-ltsc2019:v1.17.0-windows-ltsc2019-1.1,v1.17-windows-ltsc2019-1 \
-	v1.17/windows-ltsc2022:v1.17.0-windows-ltsc2022-1.1,v1.17-windows-ltsc2022-1
+	v1.17/windows-ltsc2019:v1.17.1-windows-ltsc2019-1.0,v1.17-windows-ltsc2019-1 \
+	v1.17/windows-ltsc2022:v1.17.1-windows-ltsc2022-1.0,v1.17-windows-ltsc2022-1
 
 LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES)
 ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES)
diff --git a/v1.17/alpine/Dockerfile b/v1.17/alpine/Dockerfile
index 219a19e..ab417b1 100644
--- a/v1.17/alpine/Dockerfile
+++ b/v1.17/alpine/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM alpine:3.19
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement
@@ -22,7 +22,7 @@ RUN apk update \
  && gem install rexml -v 3.3.5 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
- && gem install fluentd -v 1.17.0 \
+ && gem install fluentd -v 1.17.1 \
  && gem install bigdecimal -v 1.4.4 \
  && apk del .build-deps \
  && rm -rf /var/cache/apk/* \
diff --git a/v1.17/alpine/hooks/post_push b/v1.17/alpine/hooks/post_push
index bf0666e..7c0ff28 100644
--- a/v1.17/alpine/hooks/post_push
+++ b/v1.17/alpine/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.17.0-1.1,v1.17-1,edge}; do
+for tag in {v1.17.1-1.0,v1.17-1,edge}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 
diff --git a/v1.17/arm64/debian/Dockerfile b/v1.17/arm64/debian/Dockerfile
index 164af20..ed0b6be 100644
--- a/v1.17/arm64/debian/Dockerfile
+++ b/v1.17/arm64/debian/Dockerfile
@@ -11,7 +11,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q
 FROM --platform=linux/arm64 arm64v8/ruby:3.2-slim-bookworm
 COPY --from=builder /go/qemu-aarch64-static /usr/bin/
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 ARG CROSS_BUILD_START="cross-build-start"
 ARG CROSS_BUILD_END="cross-build-end"
 RUN [ ${CROSS_BUILD_START} ]
@@ -34,7 +34,7 @@ RUN apt-get update \
  && gem install rexml -v 3.3.5 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
- && gem install fluentd -v 1.17.0 \
+ && gem install fluentd -v 1.17.1 \
  && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
  && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \
@@ -45,7 +45,7 @@ RUN apt-get update \
  && chmod +x /usr/local/bin/tini \
  && tini -h \
  && wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
- && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
+ && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
  # Don't use MADV_FREE to reduce memory usage and improve stability
  # https://github.com/fluent/fluentd-docker-image/pull/350
  && (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
diff --git a/v1.17/arm64/debian/hooks/post_push b/v1.17/arm64/debian/hooks/post_push
index cbfe212..4811281 100644
--- a/v1.17/arm64/debian/hooks/post_push
+++ b/v1.17/arm64/debian/hooks/post_push
@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
 chmod +x manifest-tool
 
 # Tag and push image for each additional tag
-for tag in {v1.17.0-debian-arm64-1.1,v1.16-debian-arm64-1,edge-debian-arm64}; do
+for tag in {v1.17.1-debian-arm64-1.0,v1.16-debian-arm64-1,edge-debian-arm64}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 
diff --git a/v1.17/armhf/debian/Dockerfile b/v1.17/armhf/debian/Dockerfile
index 2ca9cf5..6375ee8 100644
--- a/v1.17/armhf/debian/Dockerfile
+++ b/v1.17/armhf/debian/Dockerfile
@@ -11,7 +11,7 @@ RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/re
 FROM --platform=linux/arm/v7 arm32v7/ruby:3.2-slim-bookworm
 COPY --from=builder /go/qemu-arm-static /usr/bin/
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 ARG CROSS_BUILD_START="cross-build-start"
 ARG CROSS_BUILD_END="cross-build-end"
 RUN [ ${CROSS_BUILD_START} ]
@@ -34,7 +34,7 @@ RUN apt-get update \
  && gem install rexml -v 3.3.5 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
- && gem install fluentd -v 1.17.0 \
+ && gem install fluentd -v 1.17.1 \
  && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
  && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \
@@ -45,7 +45,7 @@ RUN apt-get update \
  && chmod +x /usr/local/bin/tini \
  && tini -h \
  && wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
- && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
+ && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
  # Don't use MADV_FREE to reduce memory usage and improve stability
  # https://github.com/fluent/fluentd-docker-image/pull/350
  && (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
diff --git a/v1.17/armhf/debian/hooks/post_push b/v1.17/armhf/debian/hooks/post_push
index cfad8d9..04d93e1 100644
--- a/v1.17/armhf/debian/hooks/post_push
+++ b/v1.17/armhf/debian/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.17.0-debian-armhf-1.1,v1.17-debian-armhf-1,edge-debian-armhf}; do
+for tag in {v1.17.1-debian-armhf-1.0,v1.17-debian-armhf-1,edge-debian-armhf}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 
diff --git a/v1.17/debian/Dockerfile b/v1.17/debian/Dockerfile
index d4828c2..4a245d1 100644
--- a/v1.17/debian/Dockerfile
+++ b/v1.17/debian/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM ruby:3.2-slim-bookworm
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 ENV TINI_VERSION=0.18.0
 
 # Do not split this into multiple RUN!
@@ -23,7 +23,7 @@ RUN apt-get update \
  && gem install rexml -v 3.3.5 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
- && gem install fluentd -v 1.17.0 \
+ && gem install fluentd -v 1.17.1 \
  && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
  && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \
@@ -34,7 +34,7 @@ RUN apt-get update \
  && chmod +x /usr/local/bin/tini \
  && tini -h \
  && wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
- && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
+ && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
  # Don't use MADV_FREE to reduce memory usage and improve stability
  # https://github.com/fluent/fluentd-docker-image/pull/350
  && (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
diff --git a/v1.17/debian/hooks/post_push b/v1.17/debian/hooks/post_push
index 0f4f2b6..cd64e5e 100644
--- a/v1.17/debian/hooks/post_push
+++ b/v1.17/debian/hooks/post_push
@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
 chmod +x manifest-tool
 
 # Tag and push image for each additional tag
-for tag in {v1.17.0-debian-amd64-1.1,v1.17-debian-amd64-1,edge-debian-amd64}; do
+for tag in {v1.17.1-debian-amd64-1.0,v1.17-debian-amd64-1,edge-debian-amd64}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 
diff --git a/v1.17/windows-ltsc2019/Dockerfile b/v1.17/windows-ltsc2019/Dockerfile
index 1773759..c6261d7 100644
--- a/v1.17/windows-ltsc2019/Dockerfile
+++ b/v1.17/windows-ltsc2019/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement
@@ -18,7 +18,7 @@ RUN refreshenv \
 && gem install oj -v 3.16.5 \
 && gem install json -v 2.7.2 \
 && gem install rexml -v 3.3.5 \
-&& gem install fluentd -v 1.17.0 \
+&& gem install fluentd -v 1.17.1 \
 && gem install win32-service -v 2.3.2 \
 && gem install win32-ipc -v 0.7.0 \
 && gem install win32-event -v 0.6.3 \
diff --git a/v1.17/windows-ltsc2019/hooks/post_push b/v1.17/windows-ltsc2019/hooks/post_push
index f2c36b8..b67d141 100644
--- a/v1.17/windows-ltsc2019/hooks/post_push
+++ b/v1.17/windows-ltsc2019/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.17.0-windows-ltsc2019-1.1,v1.17-windows-ltsc2019-1}; do
+for tag in {v1.17.1-windows-ltsc2019-1.0,v1.17-windows-ltsc2019-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 
diff --git a/v1.17/windows-ltsc2022/Dockerfile b/v1.17/windows-ltsc2022/Dockerfile
index b072759..54b0c68 100644
--- a/v1.17/windows-ltsc2022/Dockerfile
+++ b/v1.17/windows-ltsc2022/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement
@@ -18,7 +18,7 @@ RUN refreshenv \
 && gem install oj -v 3.16.5 \
 && gem install json -v 2.7.2 \
 && gem install rexml -v 3.3.5 \
-&& gem install fluentd -v 1.17.0 \
+&& gem install fluentd -v 1.17.1 \
 && gem install win32-service -v 2.3.2 \
 && gem install win32-ipc -v 0.7.0 \
 && gem install win32-event -v 0.6.3 \
diff --git a/v1.17/windows-ltsc2022/hooks/post_push b/v1.17/windows-ltsc2022/hooks/post_push
index 2fbcd5d..f555814 100644
--- a/v1.17/windows-ltsc2022/hooks/post_push
+++ b/v1.17/windows-ltsc2022/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.17.0-windows-ltsc2022-1.1,v1.17-windows-ltsc2022-1}; do
+for tag in {v1.17.1-windows-ltsc2022-1.0,v1.17-windows-ltsc2022-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}