diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 8906042..56247c8 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -16,7 +16,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=postgresql11,su-exec --no-boot-update
+    --bundles=postgresql,su-exec --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
@@ -31,10 +31,10 @@ FROM clearlinux/os-core:latest
 
 COPY --from=builder /install_root /
 
-ENV PATH $PATH:/usr/libexec/postgresql11
+ENV PATH $PATH:/usr/libexec/postgresql
 ENV PGDATA /var/lib/pgsql/data
-RUN sed -i "s|#listen_addresses.*|listen_addresses = '*'|" /usr/share/postgresql11/postgresql.conf.sample && \
-    mkdir -p /run/postgresql11 && chown -R postgres:postgres /run/postgresql11 && \
+RUN sed -i "s|#listen_addresses.*|listen_addresses = '*'|" /usr/share/postgresql/postgresql.conf.sample && \
+    mkdir -p /run/postgresql && chown -R postgres:postgres /run/postgresql && \
     mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && \
     mkdir /docker-entrypoint-initdb.d && \
     mkdir -p /usr/local/bin
@@ -42,8 +42,7 @@ RUN sed -i "s|#listen_addresses.*|listen_addresses = '*'|" /usr/share/postgresql
 VOLUME /var/lib/pgsql/data
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh && \
-    ln -s /usr/local/bin/docker-entrypoint.sh / && \
-    ln -s /usr/share/postgresql11 /usr/share/postgresql
+    ln -s /usr/local/bin/docker-entrypoint.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]