diff --git a/docker/Dockerfile_sapsailing_on_sapmachine17 b/docker/Dockerfile_sapsailing_on_sapmachine17
new file mode 100644
index 00000000000..a22cdb0f983
--- /dev/null
+++ b/docker/Dockerfile_sapsailing_on_sapmachine17
@@ -0,0 +1,20 @@
+FROM sapmachine:17.0.5
+ARG RELEASE
+LABEL maintainer=axel.uhl@sap.com
+# Download and extract the release
+WORKDIR /home/sailing/servers/server
+RUN apt-get update \
+ && apt-get install -y wget apt-utils vim telnet dnsutils net-tools jq
+COPY vimrc /root/.vimrc
+RUN wget -O /tmp/rds.pem https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \
+ && ${JAVA_HOME}/bin/keytool -importcert -alias AWSRDS -file /tmp/rds.pem -keystore ${JAVA_HOME}/lib/security/cacerts -noprompt -storepass changeit \
+ && rm /tmp/rds.pem
+RUN wget -O /tmp/${RELEASE}.tar.gz http://releases.sapsailing.com/${RELEASE}/${RELEASE}.tar.gz \
+ && tar xzvpf /tmp/${RELEASE}.tar.gz \
+ && rm /tmp/${RELEASE}.tar.gz
+COPY env.sh .
+RUN cat env-default-rules.sh >>env.sh
+COPY start .
+COPY JavaSE-11.profile .
+EXPOSE 8888 14888 8000 7091 6666
+CMD [ "/home/sailing/servers/server/start", "fg" ]