diff --git a/debian/12/Dockerfile b/debian/12/Dockerfile
index dd7b04b..7c6604b 100644
--- a/debian/12/Dockerfile
+++ b/debian/12/Dockerfile
@@ -3,13 +3,13 @@ FROM postgres:12-bookworm
 ENV PGROONGA_VERSION=3.1.5-1
 RUN \
   apt update && \
-  apt install -y -V wget && \
-  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./apache-arrow-apt-source-latest-bookworm.deb && \
-  rm apache-arrow-apt-source-latest-bookworm.deb && \
-  wget https://packages.groonga.org/debian/groonga-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./groonga-apt-source-latest-bookworm.deb && \
-  rm groonga-apt-source-latest-bookworm.deb && \
+  apt install -y -V lsb-release wget && \
+  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
   apt update && \
   apt install -y -V \
     postgresql-12-pgdg-pgroonga=${PGROONGA_VERSION} \
diff --git a/debian/13/Dockerfile b/debian/13/Dockerfile
index 13f497b..2174067 100644
--- a/debian/13/Dockerfile
+++ b/debian/13/Dockerfile
@@ -3,13 +3,13 @@ FROM postgres:13-bookworm
 ENV PGROONGA_VERSION=3.1.5-1
 RUN \
   apt update && \
-  apt install -y -V wget && \
-  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./apache-arrow-apt-source-latest-bookworm.deb && \
-  rm apache-arrow-apt-source-latest-bookworm.deb && \
-  wget https://packages.groonga.org/debian/groonga-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./groonga-apt-source-latest-bookworm.deb && \
-  rm groonga-apt-source-latest-bookworm.deb && \
+  apt install -y -V lsb-release wget && \
+  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
   apt update && \
   apt install -y -V \
     postgresql-13-pgdg-pgroonga=${PGROONGA_VERSION} \
diff --git a/debian/14/Dockerfile b/debian/14/Dockerfile
index a0701c7..2edc611 100644
--- a/debian/14/Dockerfile
+++ b/debian/14/Dockerfile
@@ -3,13 +3,13 @@ FROM postgres:14-bookworm
 ENV PGROONGA_VERSION=3.1.5-1
 RUN \
   apt update && \
-  apt install -y -V wget && \
-  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./apache-arrow-apt-source-latest-bookworm.deb && \
-  rm apache-arrow-apt-source-latest-bookworm.deb && \
-  wget https://packages.groonga.org/debian/groonga-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./groonga-apt-source-latest-bookworm.deb && \
-  rm groonga-apt-source-latest-bookworm.deb && \
+  apt install -y -V lsb-release wget && \
+  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
   apt update && \
   apt install -y -V \
     postgresql-14-pgdg-pgroonga=${PGROONGA_VERSION} \
diff --git a/debian/15/Dockerfile b/debian/15/Dockerfile
index c1f28d0..70210a2 100644
--- a/debian/15/Dockerfile
+++ b/debian/15/Dockerfile
@@ -3,13 +3,13 @@ FROM postgres:15-bookworm
 ENV PGROONGA_VERSION=3.1.5-1
 RUN \
   apt update && \
-  apt install -y -V wget && \
-  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./apache-arrow-apt-source-latest-bookworm.deb && \
-  rm apache-arrow-apt-source-latest-bookworm.deb && \
-  wget https://packages.groonga.org/debian/groonga-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./groonga-apt-source-latest-bookworm.deb && \
-  rm groonga-apt-source-latest-bookworm.deb && \
+  apt install -y -V lsb-release wget && \
+  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
   apt update && \
   apt install -y -V \
     postgresql-15-pgdg-pgroonga=${PGROONGA_VERSION} \
diff --git a/debian/16/Dockerfile b/debian/16/Dockerfile
index b3cda3d..33749d6 100644
--- a/debian/16/Dockerfile
+++ b/debian/16/Dockerfile
@@ -4,13 +4,13 @@ ENV PGROONGA_VERSION=3.1.5-1
 ENV POSTGRESQL_VERSION=16
 RUN \
   apt update && \
-  apt install -y -V wget && \
-  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./apache-arrow-apt-source-latest-bookworm.deb && \
-  rm apache-arrow-apt-source-latest-bookworm.deb && \
-  wget https://packages.groonga.org/debian/groonga-apt-source-latest-bookworm.deb && \
-  apt install -y -V ./groonga-apt-source-latest-bookworm.deb && \
-  rm groonga-apt-source-latest-bookworm.deb && \
+  apt install -y -V lsb-release wget && \
+  wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
+  rm groonga-apt-source-latest-$(lsb_release --codename --short).deb && \
   apt update && \
   apt install -y -V \
     postgresql-${POSTGRESQL_VERSION}-pgdg-pgroonga=${PGROONGA_VERSION} \