diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index de2d24c533..934a46cddb 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -667,6 +667,8 @@ _docker_daemon() {
 				dm.mountopt
 				dm.override_udev_sync_check
 				dm.thinpooldev
+				dm.use_deferred_deletion
+				dm.use_deferred_removal
 			"
 			local zfs_options="zfs.fsname"
 
@@ -704,7 +706,7 @@ _docker_daemon() {
 
 	case "${words[$cword-2]}$prev=" in
 		# completions for --storage-opt
-		*dm.blkdiscard=*)
+		*dm.@(blkdiscard|override_udev_sync_check|use_deferred_@(removal|deletion))=*)
 			COMPREPLY=( $( compgen -W "false true" -- "${cur#=}" ) )
 			return
 			;;
@@ -712,10 +714,6 @@ _docker_daemon() {
 			COMPREPLY=( $( compgen -W "ext4 xfs" -- "${cur#=}" ) )
 			return
 			;;
-		*dm.override_udev_sync_check=*)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur#=}" ) )
-			return
-			;;
 		*dm.thinpooldev=*)
 			_filedir
 			return