diff --git a/qubes-release/qubes-dom0.repo.in b/qubes-release/qubes-dom0.repo.in
index 5cd43d9..e4da11c 100644
--- a/qubes-release/qubes-dom0.repo.in
+++ b/qubes-release/qubes-dom0.repo.in
@@ -1,6 +1,7 @@
 [qubes-dom0-current]
 name = Qubes Dom0 Repository (updates)
-baseurl = https://yum.qubes-os.org/r$releasever/current/dom0/%DIST%
+#baseurl = https://yum.qubes-os.org/r$releasever/current/dom0/%DIST%
+metalink = https://yum.qubes-os.org/r$releasever/current/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 1
 metadata_expire = 7d
 gpgcheck = 1
@@ -8,7 +9,8 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-dom0-current-testing]
 name = Qubes Dom0 Repository (updates-testing)
-baseurl = https://yum.qubes-os.org/r$releasever/current-testing/dom0/%DIST%
+#baseurl = https://yum.qubes-os.org/r$releasever/current-testing/dom0/%DIST%
+metalink = https://yum.qubes-os.org/r$releasever/current-testing/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
@@ -16,7 +18,8 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-dom0-security-testing]
 name = Qubes Dom0 Repository (security-testing)
-baseurl = https://yum.qubes-os.org/r$releasever/security-testing/dom0/%DIST%
+#baseurl = https://yum.qubes-os.org/r$releasever/security-testing/dom0/%DIST%
+metalink = https://yum.qubes-os.org/r$releasever/security-testing/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
@@ -24,7 +27,8 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-dom0-unstable]
 name = Qubes Dom0 Repository (unstable)
-baseurl = https://yum.qubes-os.org/r$releasever/unstable/dom0/%DIST%
+#baseurl = https://yum.qubes-os.org/r$releasever/unstable/dom0/%DIST%
+metalink = https://yum.qubes-os.org/r$releasever/unstable/dom0/%DIST%/repodata/repomd.xml.metalink
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
diff --git a/qubes-release/qubes-templates.repo b/qubes-release/qubes-templates.repo
index 92b7de6..86c355d 100644
--- a/qubes-release/qubes-templates.repo
+++ b/qubes-release/qubes-templates.repo
@@ -1,29 +1,37 @@
 [qubes-templates-itl]
 name = Qubes Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-itl
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-itl
+metalink = https://yum.qubes-os.org/r$releasever/templates-itl/repodata/repomd.xml.metalink
 enabled = 1
+fastestmirror = 1
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-templates-itl-testing]
 name = Qubes Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-itl-testing
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-itl-testing
+metalink = https://yum.qubes-os.org/r$releasever/templates-itl-testing/repodata/repomd.xml.metalink
 enabled = 0
+fastestmirror = 1
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-templates-community]
 name = Qubes Community Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-community
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-community
+metalink = https://yum.qubes-os.org/r$releasever/templates-community/repodata/repomd.xml.metalink
 enabled = 0
+fastestmirror = 1
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-templates-community
 
 [qubes-templates-community-testing]
 name = Qubes Community Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-community-testing
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-community-testing
+metalink = https://yum.qubes-os.org/r$releasever/templates-community-testing/repodata/repomd.xml.metalink
 enabled = 0
+fastestmirror = 1
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-templates-community