diff --git a/templates/zshrc b/templates/zshrc
index 4bd4d34..149502f 100644
--- a/templates/zshrc
+++ b/templates/zshrc
@@ -168,7 +168,7 @@ function docker-env() {
     else
         name=$(echo -n $1| grep -Eo '^[^:]+' | tr '/' '-')
         index=$(docker ps -a --filter "name=docker-env-$name-*" --format '{% raw %}{{.Names}}{% endraw %}' | perl -e 'my $max = 0; while (<>) {my ($n) = $_ =~ /(\d+)$/; if ($n > $max) { $max = $n };}; print $max+1;')
-        docker run --rm --name "docker-env-$name-$index" -it -v "$(pwd):/work_dir" -w "/work_dir" "$1" "${2:-bash}"
+        docker run --rm --name "docker-env-$name-$index" -it -v "$(pwd):/work_dir" -w "/work_dir" "$1" "${@:2}"
     fi
 }
 
@@ -231,3 +231,4 @@ if [ -f '/Users/daniel.de.cloet/google-cloud-sdk/completion.zsh.inc' ]; then . '
 {%- else %}
 fortune -s
 {%- endif %}
+