diff --git a/roles/lmn_vm/files/vm-run b/roles/lmn_vm/files/vm-run
index 0781779..8443af9 100755
--- a/roles/lmn_vm/files/vm-run
+++ b/roles/lmn_vm/files/vm-run
@@ -120,9 +120,9 @@ create_printerlist() {
 
 start_virtiofsd() {
   # BEGIN temporary fix, while linux-starter are not migrated to --uid and --gid
-  if [[ "$LIBVIRTOSINFO" =~ "debian.*" ]]; then
-    GUEST_UID=1000
-    GUEST_GID=1010
+  if [[ "$LIBVIRTOSINFO" =~ debian.* ]]; then
+    [[ "$GUEST_UID" == 0 ]] && GUEST_UID=1010
+    [[ "$GUEST_GID" == 0 ]] && GUEST_GID=1010
   fi
   # END temporary fix
   socket="/run/user/$(id -u $USER)/virtiofs-${VM_NAME}.sock"