diff --git a/docker/alpine/16/Dockerfile b/docker/alpine/16/Dockerfile
index 4210f87..82de7a4 100644
--- a/docker/alpine/16/Dockerfile
+++ b/docker/alpine/16/Dockerfile
@@ -23,5 +23,4 @@ COPY --from=builder /usr/local/lib/postgresql/zhparser.so /usr/local/lib/postgre
 COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
 COPY --from=builder /usr/local/share/postgresql/extension/zhparser* /usr/local/share/postgresql/extension/
 COPY --from=builder /usr/local/lib/postgresql/bitcode/zhparser* /usr/local/lib/postgresql/bitcode/
-COPY --from=builder /usr/local/share/postgresql/tsearch_data/dict.utf8.xdb /usr/local/share/postgresql/tsearch_data/
-COPY --from=builder /usr/local/share/postgresql/tsearch_data/rules.utf8.ini /usr/local/share/postgresql/tsearch_data/
+COPY --from=builder /usr/local/share/postgresql/tsearch_data/*.utf8.* /usr/local/share/postgresql/tsearch_data/
diff --git a/docker/bookworm/15/Dockerfile b/docker/bookworm/15/Dockerfile
index fa75ffd..f2e4e53 100644
--- a/docker/bookworm/15/Dockerfile
+++ b/docker/bookworm/15/Dockerfile
@@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8
 
 COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
 COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
-RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
-RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
-COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
diff --git a/docker/bookworm/16/Dockerfile b/docker/bookworm/16/Dockerfile
index 95ef8ca..f2a50f7 100644
--- a/docker/bookworm/16/Dockerfile
+++ b/docker/bookworm/16/Dockerfile
@@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8
 
 COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
 COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
-RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
-RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
-COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
-COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
diff --git a/docker/bullseye/15/Dockerfile b/docker/bullseye/15/Dockerfile
index bc09933..e45b44a 100644
--- a/docker/bullseye/15/Dockerfile
+++ b/docker/bullseye/15/Dockerfile
@@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8
 
 COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
 COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
-RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
-RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
-COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
-COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
diff --git a/docker/bullseye/16/Dockerfile b/docker/bullseye/16/Dockerfile
index 87ceefc..d3b10b6 100644
--- a/docker/bullseye/16/Dockerfile
+++ b/docker/bullseye/16/Dockerfile
@@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8
 
 COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
 COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
-RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
-RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
-COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
-COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/