diff --git a/clean_files.txt b/clean_files.txt
index f94b2dca..8e0cecf9 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -53,6 +53,7 @@ completion/available/pipx.completion.bash
 completion/available/rustup.completion.bash
 completion/available/vault.completion.bash
 completion/available/sdkman.completion.bash
+completion/available/laravel.completion.bash
 
 # aliases
 #
diff --git a/completion/available/laravel.completion.bash b/completion/available/laravel.completion.bash
index 7bd6f223..5801e4c4 100644
--- a/completion/available/laravel.completion.bash
+++ b/completion/available/laravel.completion.bash
@@ -1,15 +1,10 @@
-#!/usr/bin/bash
+# shellcheck shell=bash
 
-if command -v laravel > /dev/null; then
-    __laravel_completion()  {
-        local OPTS=("-h --help -q --quiet --ansi --no-ansi -n --no-interaction -v -vv -vvv --verbose help list new")
-        COMPREPLY=()
-        for _opt_ in ${OPTS[@]}; do
-            if [[ "$_opt_" == "$2"* ]]; then
-                COMPREPLY+=("$_opt_")
-            fi
-        done
-    }
+if _command_exists laravel; then
+	__laravel_completion() {
+		local curr=$(_get_cword)
+		COMPREPLY=($(compgen -W "list --raw --format -h --help -q --quiet -V --version --ansi --no-ansi -n --no-interaction -v -vv -vvv --verbose" -- "$curr"))
+	}
 
-    complete -F __laravel_completion laravel
+	complete -F __laravel_completion laravel
 fi