diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile
index 18bc2e89f..1d1554c9a 100644
--- a/release/preview/ubuntu18.04/docker/Dockerfile
+++ b/release/preview/ubuntu18.04/docker/Dockerfile
@@ -71,6 +71,9 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
       org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
       org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
 
+ADD ./pwsh-entrypoint.sh /usr/local/bin/pwsh-entrypoint.sh
+
+ENTRYPOINT [ "pwsh-entrypoint.sh" ]
+
 # Use PowerShell as the default shell
-# Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh-preview" ]
diff --git a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh
new file mode 100755
index 000000000..6f7ba6515
--- /dev/null
+++ b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `pwsh` or similar
+if ! { [ "$1" = 'pwsh' ] || [ "$1" = 'pwsh-preview' ] || [ "$1" = '/bin/bash' ] || [ "$1" = '/bin/sh' ] || [ "$1" = 'bash' ] || [ "$1" = 'sh' ]; }; then
+ set -- pwsh -nologo -l -c "$@"
+fi
+
+exec "$@"