diff --git a/Makefile b/Makefile
index 71161d4ba..9f5e127dd 100644
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,8 @@ install-systemd: install-init
 		$(DESTDIR)$(SYSLIBDIR)/modules-load.d \
 		$(DESTDIR)/etc/systemd/system \
 		$(DESTDIR)$(SYSLIBDIR)/systemd/network \
-		$(DESTDIR)$(SYSLIBDIR)/systemd/resolved.conf.d/
+		$(DESTDIR)$(SYSLIBDIR)/systemd/resolved.conf.d/ \
+		$(DESTDIR)$(SYSLIBDIR)/systemd/user-environment-generators
 	install -m 0644 $(SYSTEMD_CORE_SERVICES) $(DESTDIR)$(SYSLIBDIR)/systemd/system/
 	install -m 0644 vm-systemd/qubes-*.timer $(DESTDIR)$(SYSLIBDIR)/systemd/system/
 	install -m 0644 vm-systemd/75-qubes-vm.preset $(DESTDIR)$(SYSLIBDIR)/systemd/system-preset/
@@ -166,6 +167,7 @@ install-systemd: install-init
 	install -m 0644 vm-systemd/80-qubes-vif.link $(DESTDIR)$(SYSLIBDIR)/systemd/network/
 	install -m 0644 vm-systemd/30_resolved-no-mdns-or-llmnr.conf $(DESTDIR)$(SYSLIBDIR)/systemd/resolved.conf.d/
 	install -m 0644 vm-systemd/home.mount $(DESTDIR)$(SYSLIBDIR)/systemd/system/
+	install -m 0755 vm-systemd/user-environment-generators/30-qubes.sh $(DESTDIR)$(SYSLIBDIR)/systemd/user-environment-generators/30-qubes.sh
 	install -m 0644 vm-systemd/usr-local.mount $(DESTDIR)$(SYSLIBDIR)/systemd/system/
 
 .PHONY: install-sysvinit
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 32ba1881d..cae4a6301 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -120,6 +120,7 @@ lib/systemd/system/systemd-nsresourced.socket.d/30_qubes.conf
 lib/systemd/resolved.conf.d/30_resolved-no-mdns-or-llmnr.conf
 lib/systemd/system/home.mount
 lib/systemd/system/usr-local.mount
+lib/systemd/user-environment-generators/30-qubes.sh
 usr/lib/sysctl.d/20-qubes-core.conf
 usr/lib/systemd/user/tracker-extract-3.service.d/30_qubes.conf
 usr/lib/systemd/user/tracker-miner-fs-3.service.d/30_qubes.conf
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index db92b350c..3c18ca08a 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -1255,6 +1255,7 @@ The Qubes core startup configuration for SystemD init.
 %_userunitdir/gvfs-daemon.service.d/30_qubes.conf
 %_userunitdir/pipewire.service.d/40_minimal.conf
 %_userunitdir/wireplumber.service.d/30_qubes.conf
+/usr/lib/systemd/user-environment-generators/30-qubes.sh
 
 %post systemd
 
diff --git a/vm-systemd/user-environment-generators/30-qubes.sh b/vm-systemd/user-environment-generators/30-qubes.sh
new file mode 100644
index 000000000..e089f3767
--- /dev/null
+++ b/vm-systemd/user-environment-generators/30-qubes.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Disable GVFS usage for GIO clients
+if [ -f /run/qubes-service/minimal-netvm ] || [ -f /run/qubes-service/minimal-usbvm ]; then
+  echo "GIO_USE_VFS=local"
+fi