diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index 7b209c6..0bb7f7c 100755
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -30,4 +30,9 @@ for cmd in ${commands[@]}; do
 	fi
 done
 
+if [ ! -f ${XDG_CONFIG_HOME}/fish/completions/comtrya.fish ]; then
+	echo "setup comtrya completion"
+	$(echo comtrya gen-completions fish) > ${XDG_CONFIG_HOME}/fish/completions/comtrya.fish
+fi
+
 exec "$@"