diff --git a/RPM-GPG-KEY-fedora-32-primary b/RPM-GPG-KEY-fedora-32-primary
new file mode 100644
index 0000000..67bde34
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-32-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy
+H4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL
+M+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI
+U35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A
+7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o
+itLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2
+iXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v
+ergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC
+pZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih
+E6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg
+z6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB
+tDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq
+5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel
+vrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM
+NTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg
+wUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx
+7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj
+LevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA
+qY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU
+eldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb
+Akz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe
+oNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==
+=QWRO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-33-primary b/RPM-GPG-KEY-fedora-33-primary
new file mode 100644
index 0000000..ac8572f
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-33-primary
@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
+bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
+kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
+Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
+QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
+2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
+UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
+oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
+rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
+6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
+EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
+tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
+P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
+7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
+AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
+2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
+GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
+EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
+fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
+66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
+Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
+Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
+=EPL3
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-34-primary b/RPM-GPG-KEY-fedora-34-primary
new file mode 100644
index 0000000..42aafcd
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-34-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF8sAZIBEADKYvLg/5FdLXcVryAFd7Q8qrJq23R7ebxUT1u48Dc8xrsfYJZq
+aMcna/xw47wZNyek4Z6YpzqfmnjR7H8yRH/1hAPi/ixYnA6DVL7O3eGE5lYGJzN3
+E2ILTzBOI9o/pavvtOqW9N5WIus8cqSdA921v8YPzr3/BTKgGqC9biOrMA+3sNoe
+U4T+dztLg20SyBTr/rBH0eui2p/ipvIRuJvHLTKTubR+yG804yupI69M6qFBDebT
+rm+CBmwVyj/DY/92LgvCgYqV/TL5FU4qvtyB6jd8JkEeaz/G7UmDRB5JqzKEu6TB
+N3SY7nwLiRpIaXet1TWVW/8UKSB2JvYt1LbZyEO82/QOIXxqvV6h3kuBI21RvURz
+VxEjRlvPRGHMZ80OoAQqNPkLnVTcX1eLj2ClbwoXCmXFSm72cCCt1SzcAmlaWh8E
+rXSUZfs7XqkBrbphXHZ1e6Vxjt/RyKC5doklfOhbuF8gJ31CPo/kuOjFrHGzOwgi
+Llec+GHGMfI/cUOu59qo3W85GHsntvEMk83QLkKjBInEYjZSAajp/lS4QF+SD4pl
+Qj6Vc1mMCmci61cXX5CcIl1YxNJZzUfZEZNbUjDajqGzkYJoG9n2yJB0w4OiqsAe
+ZCirmUIeDUNeI082epc4RFuV33hByGYY9kRWSyM+aCF6PYVISj4l1o9KcQARAQAB
+tDFGZWRvcmEgKDM0KSA8ZmVkb3JhLTM0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEjFummQvbJuGfKhqAEWGuaUVxmjkFAl8sAZICGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQEWGuaUVxmjlVuA//QnMA02tydqwpM7r4
+WZ4OvlVqFWHhn3oDaBSwBvn6R1oC0MWbr79nnFDn3tpSkZDUdb7wyArmaF8kG8tI
+wit5xD/JAzqRBVa9z2hY3n1SFafU/hp3DwbGIL4vLUv3fRayCgWsGhGp0tZvDC9q
+PSvQZ675XpRG4pt/TGJB5gGXw7Jxoae/ffaJeblLLRDlSV/bKJt9sYpdu5InDG2i
+yIUHfamtYQtnENKL/bN6w7tU/IEgCHqxPmPRiJ0gTUAi5Yabp1+JHqskE85Hm2QF
+xMonX595Ry1yZzCjPGhCPAknJ4BhisXV+E/iV3Jyh8vxbJCo1//ygd1Xz8SkCuu/
+I0xPtFcVSIP2ikYpJwR2nwwQlLbQYIGCw/S1LV725oEYm/Z1xQ5zha2hBB+fxSwz
+7MHsD2XIHrP8NNwt3ywG3NV/BSSkvSSStGUNcQyGRi3O/x/BEIRtWRxgoNO9o3jE
+xtWFq3G5+gKY+wfYz/cTGlsWPDG7Fzx4lNisIGATKtLNqdedl7LASPK93z0XDdnS
+kfKF0HrT9rdzIKRu4xWatUVIq/65Gv7nsavdsRAQL/Y0jl6sjjQac/Te5J0fByHY
+6tGG1W0UWTd0rzFWitEZI/64/Bs83rGhjJNLqWXItZ5VqLe0TWzuxvRFLfM7oX8r
+n5Si4l7NpIJubWPqjPoCoP5lsS8=
+=V2FG
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 6ba1a9c..3a83fff 100644
--- a/archmap
+++ b/archmap
@@ -66,3 +66,9 @@ fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-modular.repo b/fedora-modular.repo
index 46f78e6..cab9c11 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -1,8 +1,8 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=0
+enabled=1
 #metadata_expire=7d
 repo_gpgcheck=0
 type=rpm
@@ -12,7 +12,7 @@ skip_if_unavailable=False
 
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -24,7 +24,7 @@ skip_if_unavailable=False
 
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 9d0a63c..9de0bf7 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -21,9 +21,9 @@
 
 [rawhide-modular]
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
-enabled=1
+enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
@@ -33,7 +33,7 @@ skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
 name=Fedora - Modular Rawhide - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -44,7 +44,7 @@ skip_if_unavailable=False
 
 [rawhide-modular-source]
 name=Fedora - Modular Rawhide - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/source/tree/
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 445b5da..72117a4 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -21,9 +21,9 @@
 
 [rawhide]
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-enabled=1
+enabled=0
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
@@ -33,7 +33,7 @@ skip_if_unavailable=False
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -44,7 +44,7 @@ skip_if_unavailable=False
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-repos.spec b/fedora-repos.spec
index a82e2a2..09a256a 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,13 +1,12 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        31
-Release:        0.3%{?_module_build:%{?dist}}
+Release:        5%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
 Provides:       fedora-repos(%{version})
 Requires:       system-release(%{version})
-Requires:       fedora-repos-rawhide = %{version}-%{release}
 Requires:       fedora-gpg-keys >= %{version}-%{release}
 Obsoletes:      fedora-repos-anaconda < 22-0.3
 Obsoletes:      fedora-repos-modular < 29-0.6
@@ -63,6 +62,9 @@ Source48:       RPM-GPG-KEY-fedora-28-primary
 Source49:       RPM-GPG-KEY-fedora-29-primary
 Source50:       RPM-GPG-KEY-fedora-30-primary
 Source51:       RPM-GPG-KEY-fedora-31-primary
+Source52:       RPM-GPG-KEY-fedora-32-primary
+Source53:       RPM-GPG-KEY-fedora-33-primary
+Source54:       RPM-GPG-KEY-fedora-34-primary
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -166,6 +168,31 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
 
 %changelog
+* Fri Aug 21 2020 Adam Williamson <awilliam@redhat.com> - 31-5
+- Add missing per-arch symlinks for f33, f34 keys
+
+* Mon Aug 17 2020 Mohan Boddu <mboddu@bhujji.com> - 31-4
+- Adding f33, f34 keys
+
+* Fri Apr 17 2020 Adam Williamson <awilliam@redhat.com> - 31-3
+- Re-add baseurl lines, but using example domain
+
+* Mon Mar 23 2020 Mohan Boddu <mboddu@bhujji.com> - 31-2
+- Remove the obsolete failovermethod from f31 fedora-repos. (kevin)
+
+* Thu Oct 10 2019 Mohan Boddu <mboddu@bhujji.com> - 31-1
+- Setup for F31 Final
+
+* Wed Aug 21 2019 Peter Robinson <pbrobinson@fedoraproject.org> 31-0.6
+- Don't require fedora-repos-rawhide
+
+* Mon Aug 19 2019 Kevin Fenzi <kevin@scrye.com> - 31-0.5
+- Add Fedora 32 key.
+
+* Tue Aug 13 2019 Tomas Hrcka <thrcka@redhat.com> - 31-0.4
+- Disable rawhide and rawhide-modular
+- Enable fedora, updates, updates-testing repositories
+
 * Tue Mar 12 2019 Vít Ondruch <vondruch@redhat.com> - 31-0.3
 - Allow to use newer GPG keys, so Rawhide can be updated after branch.
 
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index c5b739f..88d9edb 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -1,9 +1,8 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=0
+enabled=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -13,8 +12,7 @@ skip_if_unavailable=False
 
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - Debug
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -26,8 +24,7 @@ skip_if_unavailable=False
 
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index 2be7ad0..9edd7af 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -1,6 +1,6 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -12,7 +12,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -24,7 +24,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index 21e0812..3e78451 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -1,6 +1,6 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -12,7 +12,7 @@ skip_if_unavailable=False
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -24,7 +24,7 @@ skip_if_unavailable=False
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 4d5812a..0f34cb1 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -1,8 +1,8 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=0
+enabled=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -12,7 +12,7 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -24,7 +24,7 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora.repo b/fedora.repo
index faf643e..8c3a3e4 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -1,9 +1,9 @@
 [fedora]
 name=Fedora $releasever - $basearch
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=0
-#metadata_expire=7d
+enabled=1
+metadata_expire=7d
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -12,7 +12,7 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -24,7 +24,7 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d