diff --git a/vm-init.d/qubes_core b/vm-init.d/qubes_core
index de194f8..c5fe5d2 100755
--- a/vm-init.d/qubes_core
+++ b/vm-init.d/qubes_core
@@ -37,7 +37,8 @@ start()
 	fi
 
 	yum_proxy_setup=$(/usr/bin/xenstore-read qubes-service/yum-proxy-setup 2> /dev/null)
-	if [ "$yum_proxy_setup" != "0" ]; then
+    type=$(/usr/bin/xenstore-read qubes_vm_type)
+	if [ "$yum_proxy_setup" != "0" ] || [ -z "$yum_proxy_setup" -a "$type" == "TemplateVM" ]; then
 		echo proxy=http://10.137.255.254:8082/ > /etc/yum.conf.d/qubes-proxy.conf
 	else
 		echo > /etc/yum.conf.d/qubes-proxy.conf
diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh
index 0c8e9d0..77dac3f 100755
--- a/vm-systemd/qubes-sysinit.sh
+++ b/vm-systemd/qubes-sysinit.sh
@@ -4,7 +4,7 @@
 DEFAULT_ENABLED_NETVM="network-manager qubes-network qubes-update-check qubes-yum-proxy"
 DEFAULT_ENABLED_PROXYVM="meminfo-writer qubes-network qubes-firewall qubes-netwatcher qubes-update-check"
 DEFAULT_ENABLED_APPVM="meminfo-writer cups qubes-update-check"
-DEFAULT_ENABLED_TEMPLATEVM=$DEFAULT_ENABLED_APPVM
+DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM yum-proxy-setup"
 DEFAULT_ENABLED="meminfo-writer"
 
 XS_READ=/usr/bin/xenstore-read