diff --git a/d4science-storage/Dockerfile b/d4science-storage/Dockerfile
index 283f15c..1c66409 100644
--- a/d4science-storage/Dockerfile
+++ b/d4science-storage/Dockerfile
@@ -1,7 +1,7 @@
 FROM openjdk:11
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends libfuse2 fuse \
+    && apt-get install -y --no-install-recommends libfuse2 fuse tini \
     && rm -rf /var/lib/apt/lists/*
 
 ARG FUSE_JAR=https://nexus.d4science.org/nexus/content/repositories/gcube-snapshots/org/gcube/data-access/sh-fuse-integration/3.0.0-SNAPSHOT/sh-fuse-integration-3.0.0-20241201.110429-3.jar
@@ -17,4 +17,5 @@ RUN mkdir /workspace && chown 1000:100 /workspace
 
 USER 1000
 
+ENTRYPOINT ["tini", "-e", "143", "-e", "137", "--"]
 CMD ["/mount.sh"]
diff --git a/d4science-storage/mount.sh b/d4science-storage/mount.sh
index 4d6ae4f..fb3ab1a 100755
--- a/d4science-storage/mount.sh
+++ b/d4science-storage/mount.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 FUSE_JAR="/sh-fuse-integration-jar-with-dependencies.jar"
 
@@ -6,4 +6,4 @@ echo "Mounting filesystem at $MNTPATH"
 
 cd /tmp || exit
 
-java -jar "$FUSE_JAR" "$D4SCIENCE_TOKEN" "$MNTPATH"
+exec java -jar "$FUSE_JAR" "$D4SCIENCE_TOKEN" "$MNTPATH"