diff --git a/Dockerfile b/Dockerfile
index 8f2cb11..afbd00d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -149,12 +149,12 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 
 # GeoServer user => restrict access to $CATALINA_HOME and GeoServer directories
 # See also CIS Docker benchmark and docker best practices
-RUN chmod +x /opt/*.sh
+RUN chmod +x /opt/*.sh && sed -i 's/\r$//' /opt/startup.sh
 
 ENV WEBAPP_CONTEXT=geoserver
 ENV HEALTHCHECK_URL=''
 
-ENTRYPOINT ["/opt/startup.sh"]
+ENTRYPOINT ["bash", "/opt/startup.sh"]
 
 WORKDIR /opt