diff --git a/pkg/machine/proxyenv/env.go b/pkg/machine/proxyenv/env.go
index 3cc78e115b..0f0abbf78b 100644
--- a/pkg/machine/proxyenv/env.go
+++ b/pkg/machine/proxyenv/env.go
@@ -15,16 +15,19 @@ import (
 
 const proxySetupScriptTemplate = `#!/bin/bash
 
-SYSTEMD_CONF=/etc/systemd/system.conf.d/default-env.conf
+SYSTEMD_SYSTEM_CONF=/etc/systemd/system.conf.d/default-env.conf
+SYSTEMD_USER_CONF=/etc/systemd/user.conf.d/default-env.conf
 ENVD_CONF=/etc/environment.d/default-env.conf
 PROFILE_CONF=/etc/profile.d/default-env.sh
 
-mkdir -p /etc/profile.d /etc/environment.d /etc/systemd/system.conf.d/
-rm -f $SYSTEMD_CONF $ENVD_CONF $PROFILE_CONF
+mkdir -p /etc/profile.d /etc/environment.d /etc/systemd/system.conf.d/ /etc/systemd/user.conf.d/
+rm -f $SYSTEMD_SYSTEM_CONF $SYSTEMD_USER_CONF $ENVD_CONF $PROFILE_CONF
 
-echo "[Manager]" >> $SYSTEMD_CONF
+echo "[Manager]" >> $SYSTEMD_SYSTEM_CONF
+echo "[Manager]" >> $SYSTEMD_USER_CONF
 for proxy in %s; do
-	printf "DefaultEnvironment=\"%%s\"\n" "$proxy"  >> $SYSTEMD_CONF
+	printf "DefaultEnvironment=\"%%s\"\n" "$proxy"  >> $SYSTEMD_SYSTEM_CONF
+	printf "DefaultEnvironment=\"%%s\"\n" "$proxy"  >> $SYSTEMD_USER_CONF
 	printf "%%q\n" "$proxy"  >> $ENVD_CONF
 	printf "export %%q\n" "$proxy" >> $PROFILE_CONF
 done
diff --git a/pkg/machine/proxyenv/env_test.go b/pkg/machine/proxyenv/env_test.go
index de096e5d00..ebcd6975c9 100644
--- a/pkg/machine/proxyenv/env_test.go
+++ b/pkg/machine/proxyenv/env_test.go
@@ -44,16 +44,19 @@ func Test_getProxyScript(t *testing.T) {
 			},
 			want: `#!/bin/bash
 
-SYSTEMD_CONF=/etc/systemd/system.conf.d/default-env.conf
+SYSTEMD_SYSTEM_CONF=/etc/systemd/system.conf.d/default-env.conf
+SYSTEMD_USER_CONF=/etc/systemd/user.conf.d/default-env.conf
 ENVD_CONF=/etc/environment.d/default-env.conf
 PROFILE_CONF=/etc/profile.d/default-env.sh
 
-mkdir -p /etc/profile.d /etc/environment.d /etc/systemd/system.conf.d/
-rm -f $SYSTEMD_CONF $ENVD_CONF $PROFILE_CONF
+mkdir -p /etc/profile.d /etc/environment.d /etc/systemd/system.conf.d/ /etc/systemd/user.conf.d/
+rm -f $SYSTEMD_SYSTEM_CONF $SYSTEMD_USER_CONF $ENVD_CONF $PROFILE_CONF
 
-echo "[Manager]" >> $SYSTEMD_CONF
+echo "[Manager]" >> $SYSTEMD_SYSTEM_CONF
+echo "[Manager]" >> $SYSTEMD_USER_CONF
 for proxy in "http_proxy=proxy1" "https_proxy=sproxy1" "no_proxy=no1,no2"; do
-	printf "DefaultEnvironment=\"%s\"\n" "$proxy"  >> $SYSTEMD_CONF
+	printf "DefaultEnvironment=\"%s\"\n" "$proxy"  >> $SYSTEMD_SYSTEM_CONF
+	printf "DefaultEnvironment=\"%s\"\n" "$proxy"  >> $SYSTEMD_USER_CONF
 	printf "%q\n" "$proxy"  >> $ENVD_CONF
 	printf "export %q\n" "$proxy" >> $PROFILE_CONF
 done