diff --git a/Dockerfile b/Dockerfile
index 6630ebf1711326b0f6269e07c586aed033caf6c5..9eeeebaf45634dfd21cc097ad8253e1e8d524c09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,5 +24,8 @@ WORKDIR /vospace-ui-backend
 RUN mvn clean package -DskipTests -Pinclude-gui
 
 FROM openjdk:14-jdk-alpine
+RUN apk add socat
 COPY --from=0 /vospace-ui-backend/target/vospace-ui.jar /vospace-ui.jar
-ENTRYPOINT ["java","-jar","/vospace-ui.jar"]
+ADD docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b02cbc114d4269934a18407416b5b22d6a0070dc
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ ! -z "$FILE_SERVICE_PORT" ]; then
+    socat TCP-LISTEN:$FILE_SERVICE_PORT,fork TCP:vospace_file_service:$FILE_SERVICE_PORT &
+fi
+
+java -jar /vospace-ui.jar