diff --git a/Dockerfile b/Dockerfile
index 034193f0ba5ff7afbfccce1d8d17c3f76ec45f93..79ac8a11084dc6287c8d7b94726cf43b32aba0dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
 FROM openjdk:14-jdk-alpine
 ARG JAR_FILE=target/vospace.jar
 COPY ${JAR_FILE} vospace.jar
-ENTRYPOINT ["java","-jar","/vospace.jar"]
+
+RUN apk add socat
+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..244438023bad73db385e99467ff6885a46446e14
--- /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.jar