diff --git a/qubes/ext/r3compatibility.py b/qubes/ext/r3compatibility.py
index c3cabd55..c5435745 100644
--- a/qubes/ext/r3compatibility.py
+++ b/qubes/ext/r3compatibility.py
@@ -229,3 +229,6 @@ class R3Compatibility(qubes.ext.Extension):
             # forcefully convert to '0' or '1'
             vm.qdb.write('/qubes-service/{}'.format(service),
                 str(int(bool(value))))
+        if 'updates-proxy-setup' in vm.features.keys():
+            vm.qdb.write('/qubes-service/{}'.format('yum-proxy-setup'),
+                str(int(bool(vm.features['updates-proxy-setup']))))
diff --git a/qubes/vm/__init__.py b/qubes/vm/__init__.py
index cbfb1025..9b747da2 100644
--- a/qubes/vm/__init__.py
+++ b/qubes/vm/__init__.py
@@ -564,13 +564,13 @@ class BaseVM(qubes.PropertyHolder):
                     os.path.basename(sys.argv[0]), err)
             return False
 
-        # Automatically enable/disable 'yum-proxy-setup' service based on
+        # Automatically enable/disable 'updates-proxy-setup' service based on
         # allowYumProxy
         if conf['allowYumProxy']:
-            self.features['yum-proxy-setup'] = '1'
+            self.features['updates-proxy-setup'] = '1'
         else:
             try:
-                del self.features['yum-proxy-setup']
+                del self.features['updates-proxy-setup']
             except KeyError:
                 pass