diff --git a/Dockerfile b/Dockerfile
index f8b58ff..2e4c798 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,4 +36,4 @@ RUN sudo add-apt-repository -y ppa:git-core/ppa && \
 # install libdecor
 RUN dpkg --force-all -i libdecor-0-dev_0.1.0-3build1_amd64.deb libdecor-0-0_0.1.0-3build1_amd64.deb
 
-SHELL [ "/bin/bash", "--login", "-e", "-o", "pipefail", "-c" ]
\ No newline at end of file
+ADD entrypoint.sh /
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..7b23020
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT="$(mktemp)"
+
+printf '#!/bin/bash\n' > "$SCRIPT"
+printf '%s' "$*" >> "$SCRIPT"
+
+exec /bin/bash --login -e -o pipefail "$SCRIPT"