diff --git a/docker/Dockerfile.tpl b/docker/Dockerfile.tpl
index a895d51c4f8..ad6d018480b 100755
--- a/docker/Dockerfile.tpl
+++ b/docker/Dockerfile.tpl
@@ -12,4 +12,6 @@ COPY vimrc /root/.vimrc
 RUN apt-get install -y telnet
 COPY env.sh .
 COPY start .
+COPY JavaSE-11.profile .
 EXPOSE 8888 14888 8000
+CMD [ "/home/sailing/servers/server/start", "fg" ]
diff --git a/docker/env.sh b/docker/env.sh
deleted file mode 120000
index b2d27e37874..00000000000
--- a/docker/env.sh
+++ /dev/null
@@ -1 +0,0 @@
-../java/target/env.sh
\ No newline at end of file
diff --git a/docker/makeImageForLatestRelease b/docker/makeImageForLatestRelease
index 89e0f77b114..93aae60e16d 100755
--- a/docker/makeImageForLatestRelease
+++ b/docker/makeImageForLatestRelease
@@ -8,5 +8,12 @@ if [ "$release" = "" ]; then
   rm $INDEX
   echo Latest release is $release
 fi
+GITROOT=`dirname $0`/..
+echo "Copying files from GITROOT $GITROOT into Docker workspace"
+cp "$GITROOT/java/target/env.sh" .
+cp "$GITROOT/java/target/start" .
+cp "$GITROOT/java/target/configuration/JavaSE-11.profile" .
 cat Dockerfile.tpl | sed -e "s/RELEASE/${release}/g" >Dockerfile
 docker build -t sapsailing:$release .
+echo "Cleaning up..."
+rm start env.sh JavaSE-11.profile
diff --git a/docker/start b/docker/start
deleted file mode 120000
index 35d4f15dfb2..00000000000
--- a/docker/start
+++ /dev/null
@@ -1 +0,0 @@
-../java/target/start
\ No newline at end of file