diff --git a/scripts/west_commands/completion.py b/scripts/west_commands/completion.py
index 708d5500243..470d9a8b5f8 100644
--- a/scripts/west_commands/completion.py
+++ b/scripts/west_commands/completion.py
@@ -31,6 +31,12 @@ to stdout. Using the completion scripts:
     # permanent (might require sudo)
     west completion zsh > "${fpath[1]}/_west"
 
+  fish:
+    # one-time
+    west completion fish | source
+    # permanent
+    west completion fish > $HOME/.config/fish/completions/west.fish
+
 positional arguments:
   source_dir            application source directory
   cmake_opt             extra options to pass to cmake; implies -c
@@ -57,7 +63,7 @@ class Completion(WestCommand):
 
         # Remember to update west-completion.bash if you add or remove
         # flags
-        parser.add_argument('shell', nargs=1, choices=['bash', 'zsh'],
+        parser.add_argument('shell', nargs=1, choices=['bash', 'zsh', 'fish'],
                             help='''Shell that which the completion
                             script is intended for.''')
         return parser
diff --git a/scripts/west_commands/completion/west-completion.bash b/scripts/west_commands/completion/west-completion.bash
index 48375cf486a..ca3f5669d05 100644
--- a/scripts/west_commands/completion/west-completion.bash
+++ b/scripts/west_commands/completion/west-completion.bash
@@ -644,7 +644,7 @@ __comp_west_completion()
 		*)
 			local counter=$( __west_pos_first_nonflag "$(__west_to_extglob "$global_args_opts")" )
 			if [ "$cword" -eq "$counter" ]; then
-				__set_comp "bash zsh"
+				__set_comp "bash zsh fish"
 			fi
 			;;
 	esac
diff --git a/scripts/west_commands/completion/west-completion.fish b/scripts/west_commands/completion/west-completion.fish
new file mode 100644
index 00000000000..b8fc9cfa84e
--- /dev/null
+++ b/scripts/west_commands/completion/west-completion.fish
@@ -0,0 +1,371 @@
+# check if we are currently in a west workspace
+# this is used to filter which command to show
+#
+# return 0 if in west workspace
+# return 1 else
+function __zephyr_west_check_if_in_workspace
+    west topdir &>/dev/null
+    if test $status = 0
+        return 0
+    else
+        return 1
+    end
+end
+
+# exclude the caller if one of the arguments is present in the command line
+#
+# return 1 if one of the arguments is present in the command line
+# return 0 else
+function __zephyr_west_exclude
+    set -l tokens (commandline -opc)
+
+    for t in $tokens
+        for a in $argv
+            if test $t = $a
+                return 1
+            end
+        end
+    end
+
+    return 0
+end
+
+# function used to have a maximum number of arguments
+#
+# argv[1] is the maximum number of arguments
+# argv[n] are the arguments to count, if not specified will count all arguments after 'west <command>' on the command line
+#
+# return 1 if the command line contain more than $argv[1] element from $argv[n...]
+# return 0 else
+function __zephyr_west_max_args
+    set -l tokens (commandline -opc)
+    set -l argc (count $argv)
+    set -l max $argv[1]
+    set -l counter 0
+
+    if test $argc -eq 1
+        if test (math (count $tokens) - 2) -ge $max
+            return 1
+        else
+            return 0
+        end
+    end
+
+    for idx in (seq 2 $argc)
+        if contains $argv[idx] $tokens
+            set counter (math $counter + 1)
+        end
+    end
+
+    if $counter -ge $max
+        return 1
+    end
+
+    return 0
+end
+
+# alias of '__fish_complete_directories' but set the arguments to ''
+function __zephyr_west_complete_directories
+    __fish_complete_directories '' ''
+end
+
+# check if a given token is the last one in the command line
+#
+# return 0 if one of the given argument is the last token
+# return 1 else
+function __zephyr_west_is_last_token
+    set -l tokens (commandline -opc)
+
+    for token in $argv
+        if string match -qr -- "$token*" "$tokens[-1]"
+            return 0
+        end
+    end
+
+    return 1
+end
+
+# function similar to '__fish_use_subcommand' but with special cases
+function __zephyr_west_use_subcommand
+    set -l tokens (commandline -opc)
+
+    for idx in (seq 2 (count $tokens))
+        switch $tokens[$idx]
+            case '-*'
+                continue
+            case '*'
+                if test $idx -ge 3
+                    set -l prv_idx (math $idx - 1)
+                    switch $tokens[$prv_idx]
+                        # this option can be placed before subcommand and require a folder
+                        # if we don't do that the folder will be catched as a subcommand and
+                        # the subcommands will not be completed
+                        case '-z' '--zephyr-base'
+                            continue
+                    end
+                end
+            end
+        return 1
+    end
+
+    return 0
+end
+
+# function similar to '__fish_seen_subcommand_from' but with special cases
+function __zephyr_west_seen_subcommand_from
+    set -l tokens (commandline -opc)
+    set -e tokens[1]
+
+    # special case:
+    # we don't want the command completion when doing `west help <cmd>`
+    if contains -- "help" $tokens
+        return 1
+    end
+
+    for token in $tokens
+        if contains -- $token $argv
+            return 0
+        end
+    end
+
+    return 1
+end
+
+# return the list of projects
+function __zephyr_west_complete_projects
+    set -l tokens (commandline -opc)
+    set -l zephyr_base ""
+    set -l projects
+
+    for idx in (seq 1 (count $tokens))
+        if test \("$tokens[$idx]" = "-z"\) -o \("$tokens[$idx]" = "--zephyr-base"\)
+            if set -q $tokens[(math $idx + 1)]
+                set $zephyr_base $tokens (math $idx + 1)
+                break
+            end
+        end
+    end
+
+    if test $zephyr_base != ""
+        set projects (west "-z $zephyr_base" list --format="{name}")
+    else
+        set projects (west list --format="{name}")
+    end
+
+    printf "%s\n" $projects
+end
+
+# return the list of available west commands
+function __zephyr_west_complete_help
+    set -l builtin_cmds "init" "create a west repository" \
+                        "update" "update projects described in west manifest" \
+                        "list" "print information about projects" \
+                        "manifest" "manage the west manifest" \
+                        "diff" '"git diff" for one or more projects' \
+                        "statue" '"git status" for one or more projects' \
+                        "forall" "run a command in one or more local projects" \
+                        "config" "get or set config file values" \
+                        "topdir" "print the top level directory of the workspace" \
+                        "help" "get help for west or a command"
+    set -l nb_builtin_cmds (count $builtin_cmds)
+
+    set -l ext_cmds "completion" "display shell completion scripts" \
+                    "boards" "display information about supported boards" \
+                    "build" "compile a Zephyr application" \
+                    "sign" "sign a Zephyr binary for bootloader chain-loading" \
+                    "flash" "flash and run a binary on a board" \
+                    "debug" "flash and interactively debug a Zephyr application" \
+                    "debugserver" "connect to board and launch a debug server" \
+                    "attach" "interactively debug a board" \
+                    "zephyr-export" "export Zephyr installation as a CMake config package" \
+                    "spdx" "create SPDX bill of materials" \
+                    "blobs" "work with binary blobs"
+    set -l nb_ext_cmds (count $ext_cmds)
+
+    if __zephyr_west_check_if_in_workspace
+        for idx in (seq 1 2 $nb_ext_cmds)
+            set -l desc_idx (math $idx + 1)
+            printf "%s\n" $ext_cmds[$idx]\t"$ext_cmds[$desc_idx]"
+        end
+    end
+
+    for idx in (seq 1 2 $nb_builtin_cmds)
+        set -l desc_idx (math $idx + 1)
+        printf "%s\n" $builtin_cmds[$idx]\t"$builtin_cmds[$desc_idx]"
+    end
+end
+
+function __zephyr_west_complete_board
+    set -l boards (west 2>/dev/null boards --format="{name} {arch}")
+    for board in $boards
+        set -l b (string split " " $board)
+        printf "%s\n" $b[1]\t"$b[2]"
+    end
+end
+
+# disable file completion, if an option need it, it should use '--force-files'
+complete -c west -f
+
+# global options
+complete -c west -n "__zephyr_west_exclude -h --help" -o h -l help -d "show help"
+complete -c west -o v -l verbose -d "enable verbosity"
+complete -c west -n "__zephyr_west_exclude -V --version" -o V -l version -d "print version"
+complete -c west -n "__zephyr_west_exclude -z --zephyr-base; or __zephyr_west_is_last_token -z --zephyr-base" -o z -l zephyr-base -xa "(__zephyr_west_complete_directories)" -d "zephyr base folder"
+
+# init
+complete -c west -n __zephyr_west_use_subcommand -ra init -d "create a west workspace"
+complete -c west -n "__zephyr_west_seen_subcommand_from init" -ra "(__zephyr_west_complete_directories)"
+complete -c west -n "__zephyr_west_seen_subcommand_from init; and __zephyr_west_exclude -l --local" -l mr -l manifest-rev -r -d "manifest revision"
+complete -c west -n "__zephyr_west_seen_subcommand_from init" -l mf -l manifest-file -r -d "manifest file"
+complete -c west -n "__zephyr_west_seen_subcommand_from init; and __zephyr_west_exclude -l --local" -o m -l manifest -ra "(__zephyr_west_complete_directories)" -d "manifest URL"
+complete -c west -n "__zephyr_west_seen_subcommand_from init; and __zephyr_west_exclude -m --manifest --mr --manifest-rev" -o l -l local -ra "(__zephyr_west_complete_directories)" -d "use local directory as manifest repository"
+
+# update
+complete -c west -n __zephyr_west_use_subcommand -ra update -d "update projects described in west manifest"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -ra "(__zephyr_west_complete_projects)"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -l stats -d "print performance stats"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -l name-cache -ra "(__zephyr_west_complete_directories)" -d "name-based cache"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -l path-cache -ra "(__zephyr_west_complete_directories)" -d "path-based cache"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -o f -l fetch -ra "always smart" -d "fetch strategy"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -o o -l fetch-opt -d "fetch options"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -o n -l narrow -d "narrow fetch"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -o k -l keep-descendants -d "keep manifest-rev descendants checked out"
+complete -c west -n "__zephyr_west_seen_subcommand_from update" -o r -l rebase -d "rebase checked out branch onto the new manifest-rev"
+
+# list
+complete -c west -n __zephyr_west_use_subcommand -ra list -d "print information about projects"
+complete -c west -n "__zephyr_west_seen_subcommand_from list; and not __fish_seen_subcommand_from blobs" -ra "(__zephyr_west_complete_projects)"
+complete -c west -n "__zephyr_west_seen_subcommand_from list; and not __fish_seen_subcommand_from blobs" -o a -l all -d "include inactive projects"
+complete -c west -n "__zephyr_west_seen_subcommand_from list; and not __fish_seen_subcommand_from blobs" -l manifest-path-from-yaml -d "print performance stats"
+complete -c west -n "__zephyr_west_seen_subcommand_from list; and not __fish_seen_subcommand_from blobs" -o f -l format -d "format string"
+
+# manifest
+complete -c west -n __zephyr_west_use_subcommand -ra manifest -d "manage the west manifest"
+complete -c west -n "__zephyr_west_seen_subcommand_from manifest" -l resolve -d "resolve into single manifest"
+complete -c west -n "__zephyr_west_seen_subcommand_from manifest" -l freeze -d "resolve into single manifest, with SHAs"
+complete -c west -n "__zephyr_west_seen_subcommand_from manifest" -l validate -d "silently validate manifest"
+complete -c west -n "__zephyr_west_seen_subcommand_from manifest" -l path -d "print the path to the top level manifest file"
+complete -c west -n "__zephyr_west_seen_subcommand_from manifest" -o o -l output -rF -d "output file"
+
+# diff
+complete -c west -n __zephyr_west_use_subcommand -ra diff -d '"git diff" for one or more projects'
+complete -c west -n "__zephyr_west_seen_subcommand_from diff" -ra "(__zephyr_west_complete_projects)"
+complete -c west -n "__zephyr_west_seen_subcommand_from diff" -o a -l all -d "include inactive projects"
+
+# status
+complete -c west -n __zephyr_west_use_subcommand -ra status -d '"git status" for one or more projects'
+complete -c west -n "__zephyr_west_seen_subcommand_from status" -ra "(__zephyr_west_complete_projects)"
+complete -c west -n "__zephyr_west_seen_subcommand_from status" -o a -l all -d "include inactive projects"
+
+# forall
+complete -c west -n __zephyr_west_use_subcommand -ra forall -d "run a command in one or more local projects"
+complete -c west -n "__zephyr_west_seen_subcommand_from forall" -ra "(__zephyr_west_complete_projects)"
+complete -c west -n "__zephyr_west_seen_subcommand_from forall" -o c -x -d "command to execute"
+complete -c west -n "__zephyr_west_seen_subcommand_from forall" -o a -l all -d "include inactive projects"
+complete -c west -n "__zephyr_west_seen_subcommand_from forall" -o g -l group -x -d "run command on projects in one of the group"
+
+# config
+complete -c west -n __zephyr_west_use_subcommand -ra config -d "get or set config file values"
+complete -c west -n "__zephyr_west_seen_subcommand_from config" -o l -l list -d "list all options and values"
+complete -c west -n "__zephyr_west_seen_subcommand_from config" -o d -l delete -d "delete an option in one config file"
+complete -c west -n "__zephyr_west_seen_subcommand_from config" -o D -l delete-all -d "delete an option everywhere it's set"
+complete -c west -n "__zephyr_west_seen_subcommand_from config" -l system -d "system-wide file"
+complete -c west -n "__zephyr_west_seen_subcommand_from config" -l global -d "global user-wide"
+complete -c west -n "__zephyr_west_seen_subcommand_from config" -l local -d "this workspace's file"
+
+# topdir
+complete -c west -n __zephyr_west_use_subcommand -a topdir -d "print the top level directory of the workspace"
+
+# help
+complete -c west -n __zephyr_west_use_subcommand -ra help -d "get help for west or a command"
+complete -c west -n "__fish_seen_subcommand_from help; and __zephyr_west_max_args 1" -ra "(__zephyr_west_complete_help)"
+
+
+
+# completion
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra completion -d "display shell completion scripts"
+complete -c west -n "__zephyr_west_seen_subcommand_from completion; and __zephyr_west_max_args 1" -ra "bash zsh fish"
+
+# boards
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra boards -d "display information about supported boards"
+complete -c west -n "__zephyr_west_seen_subcommand_from boards" -o f -l format -d "format string"
+complete -c west -n "__zephyr_west_seen_subcommand_from boards" -o n -l name -d "name regex"
+complete -c west -n "__zephyr_west_seen_subcommand_from boards" -l arch-root -xa "(__zephyr_west_complete_directories)" -d "add an arch root"
+complete -c west -n "__zephyr_west_seen_subcommand_from boards" -l board-root -xa "(__zephyr_west_complete_directories)" -d "add a board root"
+
+# build
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra build -d "compile a Zephyr application"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -ra "(__zephyr_west_complete_directories)"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o b -l board -xa "(__zephyr_west_complete_board)" -d "board to build for"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o d -l build-dir -xa "(__zephyr_west_complete_directories)" -d "build directory to create or use"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o f -l force -d "ignore errors and continue"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -l sysbuild -d "create multi-domain build system"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -l no-sysbuild -d "do not create multi-domain build system"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o c -l cmake -d "force a cmake run"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -l domain -d "execute build tool (make or ninja) for a given domain"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o t -l target -d "run build system target"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o T -l test-item -d "build based on test data in .yml"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o o -l build-opt -d "options to pass to build tool (make or ninja)"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o n -l just-print -l dry-run -l recon -d "just print build commands, don't run them"
+complete -c west -n "__zephyr_west_seen_subcommand_from build" -o p -l pristine -ra "auto always never" -d "pristine build setting"
+
+# sign
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra sign -d "sign a Zephyr binary for bootloader chain-loading"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o d -l build-dir -ra "(__zephyr_west_complete_directories)" -d "build directory to create or use"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o q -l quiet -d "suppress non-error output"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o f -l force -d "ignore errors and continue"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o t -l tool -ra "imgtool rimage" -d "image signing tool name"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o p -l tool-path -ra "(__zephyr_west_complete_directories)" -d "path to the tool"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o P -l tool-data -ra "(__zephyr_west_complete_directories)" -d "path to tool data"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign; and __zephyr_west_exclude --no-bin" -l bin -d "produce a signed bin file"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign; and __zephyr_west_exclude --bin" -l no-bin -d "do not produce a signed bin file"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o B -l sbin -rF -d "signed .bin filename"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign; and __zephyr_west_exclude --no-hex" -l hex -d "produce a signed hex file"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign; and __zephyr_west_exclude --hex" -l no-hex -d "do not produce a signed hex file"
+complete -c west -n "__zephyr_west_seen_subcommand_from sign" -o H -l shex -rF -d "signed .hex filename"
+
+# flash
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra flash -d "flash and run a binary on a board"
+
+# debug
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra debug -d "flash and interactively debug a Zephyr application"
+
+# debugserver
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra debugserver -d "connect to board and launch a debug server"
+
+# attach
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra attach -d "interactively debug a board"
+
+## flash, debug, debugserver, attach
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -o d -l build-dir -ra "(__zephyr_west_complete_directories)" -d "build directory to create or use"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -o r -l runner -r -d "override default runner from build-dir"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l skip-rebuild -d "do not refresh cmake dependencies first"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l domain -r -d "execute build tool (make or ninja) for a given domain"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -o H -l context -d "print runner-specific options"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l board-dir -ra "(__zephyr_west_complete_directories)" -d "board directory"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -o f -l file -Fr -d "path to binary"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -o t -l file-type -ra "hex bin elf" -d "type of binary"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l elf-file -rka "(__fish_complete_suffix .elf)" -d "path to zephyr.elf"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l hex-file -rka "(__fish_complete_suffix .hex)" -d "path to zephyr.hex"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l bin-file -rka "(__fish_complete_suffix .bin)" -d "path to zephyr.bin"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l gdb -Fr -d "path to GDB"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l openocd -Fr -d "path to openocd"
+complete -c west -n "__zephyr_west_seen_subcommand_from flash debug debugserver attach" -l openocd-search -ra "(__zephyr_west_complete_directories)" -d "path to add to openocd search path"
+
+# zephyr-export
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra zephyr-export -d "export Zephyr installation as a CMake config package"
+
+# spdx
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra spdx -d "create SPDX bill of materials"
+complete -c west -n "__zephyr_west_seen_subcommand_from spdx" -o i -l init -d "initialize CMake file-based API"
+complete -c west -n "__zephyr_west_seen_subcommand_from spdx" -o d -l build-dir -ra "(__zephyr_west_complete_directories)" -d "build directory to create or use"
+complete -c west -n "__zephyr_west_seen_subcommand_from spdx" -o n -l namespace-prefix -rf -d "namespace prefix"
+complete -c west -n "__zephyr_west_seen_subcommand_from spdx" -o s -l spdx-dir -ra "(__zephyr_west_complete_directories)" -d "SPDX output directory"
+complete -c west -n "__zephyr_west_seen_subcommand_from spdx" -l analyze-includes -d "also analyze included header files"
+complete -c west -n "__zephyr_west_seen_subcommand_from spdx" -l include-sdk -d "also generate SPDX document for SDK"
+
+# blobs
+complete -c west -n "__zephyr_west_use_subcommand; and __zephyr_west_check_if_in_workspace" -ra blobs -d "work with binary blobs"
+complete -c west -n "__zephyr_west_seen_subcommand_from blobs; and not __fish_seen_subcommand_from list fetch clean" -ra "list\t'list binary blobs' fetch\t'fetch binary blobs' clean\t'clean working tree of binary blobs'"
+complete -c west -n "__zephyr_west_seen_subcommand_from blobs; and __fish_seen_subcommand_from list fetch clean" -ra "(__zephyr_west_complete_projects)"
+complete -c west -n "__zephyr_west_seen_subcommand_from blobs; and not __fish_seen_subcommand_from fetch clean" -o f -l format -r -d "format string"
diff --git a/scripts/west_commands/completion/west-completion.zsh b/scripts/west_commands/completion/west-completion.zsh
index 8cca9b5eee0..43c7c0ffc19 100644
--- a/scripts/west_commands/completion/west-completion.zsh
+++ b/scripts/west_commands/completion/west-completion.zsh
@@ -205,7 +205,7 @@ _west_help() {
 
 _west_completion() {
 
-  _arguments -S "1:shell:(bash zsh)"
+  _arguments -S "1:shell:(bash zsh fish)"
 }
 
 _west_boards() {