diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
index c22b122f1d..1ed924e63a 100644
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -25,7 +25,7 @@ __contains_word () {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager 2>/dev/null |
+    machinectl list --full --no-legend --no-pager 2>/dev/null |
         { while read a b; do echo " $a"; done; };
 }
 
diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl
index 35ff311bbd..757c3d77f4 100644
--- a/shell-completion/bash/journalctl
+++ b/shell-completion/bash/journalctl
@@ -27,7 +27,7 @@ __contains_word () {
 
 __get_machines() {
     local a b
-    (machinectl list-images --no-legend --no-pager; machinectl list --no-legend --no-pager; echo ".host") | \
+    (machinectl list-images --full --no-legend --no-pager; machinectl list --full --no-legend --no-pager; echo ".host") | \
         { while read a b; do echo " $a"; done; } | sort -u;
 }
 
diff --git a/shell-completion/bash/loginctl b/shell-completion/bash/loginctl
index c3e1ca754b..35a71de32e 100644
--- a/shell-completion/bash/loginctl
+++ b/shell-completion/bash/loginctl
@@ -31,7 +31,7 @@ __get_all_seats    () { loginctl --no-legend list-seats    | { while read -r a b
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager 2>/dev/null |
+    machinectl list --full --no-legend --no-pager 2>/dev/null |
         { while read a b; do echo " $a"; done; };
 }
 
diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl
index b785cd4154..a89ce812b2 100644
--- a/shell-completion/bash/machinectl
+++ b/shell-completion/bash/machinectl
@@ -25,7 +25,7 @@ __contains_word() {
 
 __get_machines() {
     local a b
-    (machinectl list-images --no-legend --no-pager; machinectl list --no-legend --no-pager; echo ".host") | \
+    (machinectl list-images --full --no-legend --no-pager; machinectl list --full --no-legend --no-pager; echo ".host") | \
 	{ while read a b; do echo " $a"; done; } | sort -u;
 }
 
diff --git a/shell-completion/bash/portablectl b/shell-completion/bash/portablectl
index d20c9629b7..b60d8c5c4b 100644
--- a/shell-completion/bash/portablectl
+++ b/shell-completion/bash/portablectl
@@ -25,7 +25,7 @@ __contains_word () {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager 2>/dev/null |
+    machinectl list --full --no-legend --no-pager 2>/dev/null |
         { while read a b; do echo " $a"; done; };
 }
 
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
index 7d2f0f88a2..f81dafba8e 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -113,7 +113,7 @@ __get_all_unit_files () { { __systemctl $1 list-unit-files "$2*"; } | { while re
 
 __get_machines() {
     local a b
-    { machinectl list-images --no-legend --no-pager; machinectl list --no-legend --no-pager; } | \
+    { machinectl list-images --full --no-legend --no-pager; machinectl list --full --no-legend --no-pager; } | \
         { while read a b; do echo " $a"; done; }
 }
 
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
index 986dad5d58..1b4f1b0d10 100644
--- a/shell-completion/bash/systemd-analyze
+++ b/shell-completion/bash/systemd-analyze
@@ -27,7 +27,7 @@ __contains_word () {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
+    machinectl list --full --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 __get_services() {
diff --git a/shell-completion/bash/systemd-cgls b/shell-completion/bash/systemd-cgls
index 9a5969bee7..10f6b38fcc 100644
--- a/shell-completion/bash/systemd-cgls
+++ b/shell-completion/bash/systemd-cgls
@@ -25,7 +25,7 @@ __contains_word() {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
+    machinectl list --full --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 __get_units_have_cgroup() {
diff --git a/shell-completion/bash/systemd-cgtop b/shell-completion/bash/systemd-cgtop
index 8689897130..a5e3401959 100644
--- a/shell-completion/bash/systemd-cgtop
+++ b/shell-completion/bash/systemd-cgtop
@@ -25,7 +25,7 @@ __contains_word() {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
+    machinectl list --full --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 _systemd_cgtop() {
diff --git a/shell-completion/bash/systemd-nspawn b/shell-completion/bash/systemd-nspawn
index 941ea9090b..d263fd5dd9 100644
--- a/shell-completion/bash/systemd-nspawn
+++ b/shell-completion/bash/systemd-nspawn
@@ -35,7 +35,7 @@ __get_slices() {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
+    machinectl list --full --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 __get_env() {
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
index 707b038d9a..71692aa19c 100644
--- a/shell-completion/bash/systemd-run
+++ b/shell-completion/bash/systemd-run
@@ -26,7 +26,7 @@ __get_slice_units () { __systemctl $1 list-units --all -t slice \
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
+    machinectl list --full --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 _systemd_run() {
diff --git a/shell-completion/bash/timedatectl b/shell-completion/bash/timedatectl
index 385dee7dd4..4605fafc46 100644
--- a/shell-completion/bash/timedatectl
+++ b/shell-completion/bash/timedatectl
@@ -27,7 +27,7 @@ __contains_word () {
 
 __get_machines() {
     local a b
-    machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
+    machinectl list --full --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 __get_interfaces(){