diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 1801abbc8..1b071002c 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -74,10 +74,10 @@ RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.
 
 RUN chmod 777 /docker-entrypoint-initdb.d/*
 
-RUN echo "\nsleep infinity" >> /ha_entrypoint.sh
-
 WORKDIR /config
-ENTRYPOINT [ "/ha_entrypoint.sh" ]
+ENTRYPOINT [ "/usr/bin/env" ]
+CMD [ "/ha_entrypoint.sh" ]
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ############
 # 5 Labels #