diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 2c2a95fe04..23f56fcc14 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -2181,6 +2181,10 @@ _docker_ps() {
 			__docker_complete_container_ids
 			return
 			;;
+		is-task)
+			COMPREPLY=( $( compgen -W "true false" -- "${cur##*=}" ) )
+			return
+			;;
 		name)
 			cur="${cur##*=}"
 			__docker_complete_container_names
diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index 6f1c660bc1..535f1f1ec2 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -333,6 +333,9 @@ __docker_complete_ps_filters() {
             (id)
                 __docker_containers_ids && ret=0
                 ;;
+            (is-task)
+                _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
+                ;;
             (name)
                 __docker_containers_names && ret=0
                 ;;
diff --git a/docs/reference/commandline/ps.md b/docs/reference/commandline/ps.md
index 1f3ceb3799..541979e819 100644
--- a/docs/reference/commandline/ps.md
+++ b/docs/reference/commandline/ps.md
@@ -27,6 +27,7 @@ Options:
                         - since=(<container-name>|<container-id>)
                         - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>)
                           containers created from an image or a descendant.
+                        - is-task=(true|false)
       --format string   Pretty-print containers using a Go template
       --help            Print usage
   -n, --last int        Show n last created containers (includes all states) (default -1)
diff --git a/man/docker-ps.1.md b/man/docker-ps.1.md
index 14c770121f..fd6c4e78fa 100644
--- a/man/docker-ps.1.md
+++ b/man/docker-ps.1.md
@@ -32,6 +32,7 @@ the running containers.
    - status=(created|restarting|running|paused|exited|dead)
    - name=<string> a container's name
    - id=<ID> a container's ID
+   - is-task=(true|false) - containers that are a task (part of a service managed by swarm)
    - before=(<container-name>|<container-id>)
    - since=(<container-name>|<container-id>)
    - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>) - containers created from an image or a descendant.