diff --git a/client/src/docker/completion.bash b/client/src/docker/completion.bash
index b5477ed..77b3aef 100644
--- a/client/src/docker/completion.bash
+++ b/client/src/docker/completion.bash
@@ -31,7 +31,7 @@ function docker-finance::completion()
   local _prev="${COMP_WORDS[COMP_CWORD - 1]}"
 
   local _images
-  mapfile -t _images < <(docker image ls | grep ^docker-finance | cut -d'/' -f2- | cut -d' ' -f1-4 | sed -e 's/   /:/')
+  mapfile -t _images < <(docker images --format "{{.Repository}}:{{.Tag}}" --filter=reference='docker-finance/*/*:*' | cut -d'/' -f2-)
   declare -r _images
 
   local -r _commands=("gen" "edit" "build" "backup" "rm" "up" "down" "start" "stop" "run" "shell" "version" "license" "linter" "doxygen" "plugins")