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/RPM-GPG-KEY-fedora-35-primary b/RPM-GPG-KEY-fedora-35-primary
new file mode 100644
index 0000000..899affa
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-35-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGAcScoBEADLf8YHkezJ6adlMYw7aGGIlJalt8Jj2x/B2K+hIfIuxGtpVj7e
+LRgDU76jaT5pVD5mFMJ3pkeneR/cTmqqQkNyQshX2oQXwEzUSb1CNMCfCGgkX8Q2
+zZkrIcCrF0Q2wrKblaudhU+iVanADsm18YEqsb5AU37dtUrM3QYdWg9R+XiPfV8R
+KBjT03vVBOdMSsY39LaCn6Ip1Ovp8IEo/IeEVY1qmCOPAaK0bJH3ufg4Cueks+TS
+wQWTeCLxuZL6OMXoOPKwvMQfxbg1XD8vuZ0Ktj/cNH2xau0xmsAu9HJpekvOPRxl
+yqtjyZfroVieFypwZgvQwtnnM8/gSEu/JVTrY052mEUT7Ccb74kcHFTFfMklnkG/
+0fU4ARa504H3xj0ktbe3vKcPXoPOuKBVsHSv00UGYAyPeuy+87cU/YEhM7k3SVKj
+6eIZgyiMO0wl1YGDRKculwks9A+ulkg1oTb4s3zmZvP07GoTxW42jaK5WS+NhZee
+860XoVhbc1KpS+jfZojsrEtZ8PbUZ+YvF8RprdWArjHbJk2JpRKAxThxsQAsBhG1
+0Lux2WaMB0g2I5PcMdJ/cqjo08ccrjBXuixWri5iu9MXp8qT/fSzNmsdIgn8/qZK
+i8Qulfu77uqhW/wt2btnitgRsqjhxMujYU4Zb4hktF8hKU/XX742qhL5KwARAQAB
+tDFGZWRvcmEgKDM1KSA8ZmVkb3JhLTM1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEeH6mrhFH7uVsQLMM20Y5cZhnxY8FAmAcScoCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ20Y5cZhnxY+NYA/7BYpglySAZYHhjyKh
+/+f6zPfVvbH20Eq3kI7OFBN0nLX+BU1muvS+qTuS3WLrB3m3GultpKREJKLtm5ED
+1rGzXAoT1yp9YI8LADdMCCOyjAjsoWU87YUuC+/bnjrTeR2LROCfyPC76W985iOV
+m5S+bsQDw7C2LrldAM4MDuoyZ1SitGaZ4KQLVt+TEa14isYSGCjzo7PY8V3JOk50
+gqWg82N/bm2EzS7T83WEDb1lvj4IlvxgIqKeg11zXYxmrYSZJJCfvzf+lNS6uxgH
+jx/J0ylZ2LibGr6GAAyO9UWrAZSwSM0EcjT8wECnxkSDuyqmWwVvNBXuEIV8Oe3Y
+MiU1fJN8sd7DpsFx5M+XdnMnQS+HrjTPKD3mWrlAdnEThdYV8jZkpWhDys3/99eO
+hk0rLny0jNwkauf/iU8Oc6XvMkjLRMJg5U9VKyJuWWtzwXnjMN5WRFBqK4sZomMM
+ftbTH1+5ybRW/A3vBbaxRW2t7UzNjczekSZEiaLN9L/HcJCIR1QF8682DdAlEF9d
+k2gQiYSQAaaJ0JJAzHvRkRJLLgK2YQYiHNVy2t3JyFfsram5wSCWOfhPeIyLBTZJ
+vrpNlPbefsT957Tf2BNIugzZrC5VxDSKkZgRh1VGvSIQnCyzkQy6EU2qPpiW59G/
+hPIXZrKocK3KLS9/izJQTRltjMA=
+=PfT7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-36-primary b/RPM-GPG-KEY-fedora-36-primary
new file mode 100644
index 0000000..3b1b19b
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-36-primary
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGAkKwgBEAC+IQKqp/BI1VIvRRqcnRoAxkzsY3pxIS1L+C4gaWjIMf1eBBTq
+v9eKd4xHsW80VL/tl81WZWO/7JXKmgHODiXrv4HmDIOo6Z1hxehjVRF3Ih4+sKHR
+XCJgwcdJnMfqTKnHiycQggeDuheWbfjV2Fgmvxy0jh0M5PCB5taNz41LmPOaUQmn
+PXcI05CjP5msKjRBObw5Cd2oad60pTNhnBWRf288S8W4wH4jNISOZLZTOf6HU5gJ
+w9wU9RZoaz8kZPNArlJjZsN83S0XLCxpa6UUgYdzPDHOWGtcWGs3bvNAlTYuacun
+oICOvTH/ZJU7mgaZbbdSPVLDJdLBKRVgHbdTAK0J913FEiU93GJR5bf/W5FMN7DV
+6hsJVMiY/knJmkTFE9whDSjEc0TAYhQuC1HnzvMPGJvkeEz9nRqna5QUuo7V6LI4
+fZNTSlqFyIi/Oa3ZoliOyOshxJmU3y1HaNcHerO1nFbTtZ7s/TKBhY9oFq4T4gJV
+yFWy33p/JDxOtlVjpHEkzwXGdPe6R4xK8xHObEVraOMZMaweII+tMOGwVbxZu2kC
+A1aflM+oeyU1Fx9qqM0+dYyHO+kp3M5UtfM006RcNcdfoGrA4l6z9sUnHKsYzOLP
+RvKkzxiX3T91vHtRGCXjPOgOsJJzjkFtE1a5oFZg39fC99HZdbX0rUqAtQARAQAB
+tDFGZWRvcmEgKDM2KSA8ZmVkb3JhLTM2LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEU97Sy5Iti42eY/0YmZ98vzircfQFAmAkKwgCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQmZ98vzircfSGaxAAlDBWuY1Ch3YsssGE
+uaeOuaHmDj08p08WUAFUPBN0ID+0pmRQjywFzrufw8Z2g/lHwic+tpXXr/RtMmcl
++WzLh1E34TRqEngjDJ27QBq1Jyid3h1manKLhZhJ8b1usKHP7Dqh7n+eMTv2Qgrt
+6MrCNe4otWZ9WJ5vp/Bay5yAtU6lNoWBmJ+6BS1/2mg2jhoXrfg/Vey+/i6nYZIk
+M4IcYCyGCi9rjc8NMgkCyzPkPJtsy2taB+VdUcZyjFpc1acmC8sR/2/SEl4+pOtM
+UzW+OUOQFrerX/8MC5LqvmtsiPMyRDCOw3reJTXyoUIehoHoK9QtAdIRRP2nAkPy
+GKycVzsLbtheJXUZharXL1DwOkpMNlm3hp9BxX89m7dLblMSjtrQPs8CkpAExAQW
+FBltsD73ZhGnfE/XdWp7343m1w5W2m85/rczP+2et+c+HPmYTgaJTu8fAF0FoTDd
+uD1r9DxRa2oN3YBiPP/nXnhJaH//GgF/RRw7Fbc66fCh8DTrMsPgmyi/O3/pdSGe
+k0UqEfSdzNPbl7gVFlCbr4Ur5n1ph+sEZqOhMuyszLZZvYvUrHsDuanML5X25coP
+h+rqyjHJJeYlS2tMAQB1fmHB0LWhRhKYaOROAXFmUutFUxVVoigNCl8mV561DCz6
+6/zy81ZGeyUGOEIZ1NFuoY0EhC8=
+=KaIq
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index cfd6fb7..63d86ce 100644
--- a/archmap
+++ b/archmap
@@ -1,8 +1,10 @@
 fedora-7-primary: i386 x86_64 ppc ppc64
 
 fedora-8-primary: i386 x86_64 ppc ppc64
+fedora-8-primary-original:
 
 fedora-9-primary: i386 x86_64 ppc ppc64
+fedora-9-primary-original:
 fedora-9-secondary: ia64
 
 fedora-10-primary: i386 x86_64 ppc ppc64
@@ -19,7 +21,7 @@ fedora-13-secondary: arm mips
 fedora-14-primary: i386 x86_64
 fedora-14-secondary: arm
 
-fedora-15-primary: i386 x86_64 
+fedora-15-primary: i386 x86_64
 fedora-15-secondary: arm armhfp ppc ppc64 s390 s390x
 
 fedora-16-primary: i386 x86_64
@@ -60,6 +62,7 @@ fedora-27-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 
 fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
+fedora-modularity:
 
 fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
@@ -70,3 +73,9 @@ 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
+
+fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
+
+fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index 32a3241..02150d9 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -1,22 +1,21 @@
 [fedora-cisco-openh264]
 name=Fedora $releasever openh264 (From Cisco) - $basearch
-baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
 type=rpm
-enabled=0
-enabled_metadata=1
+enabled=1
 metadata_expire=14d
-repo_gpgcheck=1
+repo_gpgcheck=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=True
 
 [fedora-cisco-openh264-debuginfo]
 name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
-baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
 type=rpm
 enabled=0
-metadata_expire=28d
-repo_gpgcheck=1
+metadata_expire=14d
+repo_gpgcheck=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=True
diff --git a/fedora-compose.conf b/fedora-compose.conf
new file mode 100644
index 0000000..8bf015d
--- /dev/null
+++ b/fedora-compose.conf
@@ -0,0 +1,4 @@
+[remote "fedora-compose"]
+url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/
+gpg-verify=true
+gpgkeypath=/etc/pki/rpm-gpg/
diff --git a/fedora-eln.repo b/fedora-eln.repo
new file mode 100644
index 0000000..c6b7f44
--- /dev/null
+++ b/fedora-eln.repo
@@ -0,0 +1,96 @@
+# These packages are untested and still under development. This
+# repository is used for development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
+# Required) is available as a discussion forum for
+# testing and troubleshooting for development packages in conjunction
+# with new test releases.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing
+#
+# Reproducible and reportable issues should be filed at
+# http://bugzilla.redhat.com/.
+#
+# Product: Fedora
+# Version: eln
+
+[eln-baseos]
+name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-baseos-debuginfo]
+name=Fedora - ELN BaseOS - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-baseos-source]
+name=Fedora - ELN BaseOS - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+
+
+[eln-appstream]
+name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch
+enabled=AUTO_VALUE
+countme=1
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-appstream-debuginfo]
+name=Fedora - ELN AppStream - Debug
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[eln-appstream-source]
+name=Fedora - ELN AppStream - Source
+baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/fedora-modular.repo b/fedora-modular.repo
index e7c436e..f511170 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -1,9 +1,10 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
+#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=AUTO_VALUE
 countme=1
-#metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -12,9 +13,10 @@ skip_if_unavailable=False
 
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
+#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
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -23,9 +25,10 @@ skip_if_unavailable=False
 
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
+#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
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 25548ac..24c47a7 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -11,7 +11,7 @@
 # testing and troubleshooting for development packages in conjunction
 # with new test releases.
 #
-# More information is available at http://fedoraproject.org/wiki/Testing 
+# More information is available at http://fedoraproject.org/wiki/Testing
 #
 # Reproducible and reportable issues should be filed at
 # http://bugzilla.redhat.com/.
@@ -21,33 +21,37 @@
 
 [rawhide-modular]
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
+#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=AUTO_VALUE
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
 name=Fedora - Modular Rawhide - Debug
+#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
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-modular-source]
 name=Fedora - Modular Rawhide - Source
+#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
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
-
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 7fb162c..5391fb0 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -11,7 +11,7 @@
 # testing and troubleshooting for development packages in conjunction
 # with new test releases.
 #
-# More information is available at http://fedoraproject.org/wiki/Testing 
+# More information is available at http://fedoraproject.org/wiki/Testing
 #
 # Reproducible and reportable issues should be filed at
 # http://bugzilla.redhat.com/.
@@ -21,33 +21,37 @@
 
 [rawhide]
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
+#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=AUTO_VALUE
 countme=1
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
+#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
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
+#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
+metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE
 skip_if_unavailable=False
-
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 0763f8e..97a7d8d 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,13 +1,15 @@
+%global rawhide_release 35
+%global updates_testing_enabled 0
+
 Summary:        Fedora package repositories
 Name:           fedora-repos
-Version:        33
-Release:        0.1%{?_module_build:%{?dist}}
+Version:        32
+Release:        13%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
-Provides:       fedora-repos(%{version})
+Provides:       fedora-repos(%{version}) = %{release}
 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
@@ -20,6 +22,9 @@ Source3:        fedora-updates.repo
 Source4:        fedora-updates-testing.repo
 Source5:        fedora-rawhide.repo
 Source6:        fedora-cisco-openh264.repo
+Source7:        fedora-updates-archive.repo
+Source8:        fedora-eln.repo
+
 
 Source10:       RPM-GPG-KEY-fedora-7-primary
 Source11:       RPM-GPG-KEY-fedora-8-primary
@@ -65,6 +70,12 @@ 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
+Source55:       RPM-GPG-KEY-fedora-35-primary
+Source56:       RPM-GPG-KEY-fedora-36-primary
+# When bumping Rawhide to fN, create N+1 key (and update archmap). (This
+# ensures users have the next future key installed and referenced, even if they
+# don't update very often. This will smooth out Rawhide N->N+1 transition for them).
 
 Source100:      fedora-modular.repo
 Source101:      fedora-updates-modular.repo
@@ -74,6 +85,7 @@ Source104:      RPM-GPG-KEY-fedora-modularity
 
 Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
+Source152:      fedora-compose.conf
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys
@@ -88,6 +100,14 @@ Provides:       fedora-repos-rawhide-modular = %{version}-%{release}
 %description rawhide
 This package provides the rawhide repo definitions.
 
+%package archive
+Summary:        Fedora updates archive package repository
+Requires:       fedora-repos = %{version}-%{release}
+
+%description archive
+This package provides the repo definition for the updates archive repo.
+It is a package repository that contains any RPM that has made it to
+stable in Bodhi and been available in the Fedora updates repo in the past.
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
@@ -105,6 +125,16 @@ This package provides ostree specfic files like remote config from
 where client's system will pull OSTree updates.
 
 
+%package eln
+Summary: ELN repo definitions
+Requires: fedora-repos-rawhide = %{version}-%{release}
+Requires: fedora-repos-rawhide-modular = %{version}-%{release}
+
+%description eln
+This package provides repository files for ELN (Enterprise Linux Next)
+packages that can be installed atop Rawhide. Note that these packages are
+experimental and should not be used in a production environment.
+
 
 %prep
 
@@ -120,10 +150,18 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 #     says "fedora-19-primary: i386 x86_64",
 #     RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key.
 pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+# Also add a symlink for Rawhide and ELN keys
+ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-rawhide-primary
+ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-eln-primary
 for keyfile in RPM-GPG-KEY*; do
-    key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
-    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \
-        || echo "WARNING: no archmap entry for $key"
+    # resolve symlinks, so that we don't need to keep duplicate entries in archmap
+    real_keyfile=$(basename $(readlink -f $keyfile))
+    key=${real_keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
+    if ! grep -q "^${key}:" %{_sourcedir}/archmap; then
+        echo "ERROR: no archmap entry for $key"
+        exit 1
+    fi
+    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap)
     for arch in $arches; do
         # replace last part with $arch (fedora-20-primary -> fedora-20-$arch)
         ln -s $keyfile ${keyfile%%-*}-$arch # NOTE: RPM replaces %% with %
@@ -133,14 +171,150 @@ done
 ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
 popd
 
+# Install repo files
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in %{_sourcedir}/fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+# Enable or disable repos based on current release cycle state.
+%if %{rawhide_release} == %{version}
+rawhide_enabled=1
+stable_enabled=0
+testing_enabled=0
+%else
+rawhide_enabled=0
+stable_enabled=1
+testing_enabled=%{updates_testing_enabled}
+%endif
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
+done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1
+done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1
+done
+
+# Adjust Rawhide repo files to include Rawhide+1 GPG key.
+# This is necessary for the period when Rawhide gets bumped to N+1 and packages
+# start to be signed with a newer key. Without having the key specified in the
+# repo file, the system would consider the new packages as untrusted.
+rawhide_next=$((%{rawhide_release}+1))
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
+    sed -i "/^gpgkey=/ s@AUTO_VALUE@file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \
+        $repo || exit 1
+done
+
+# Set appropriate metadata_expire in base repo files (6h before Final, 7d after)
+%if "%{release}" < "1"
+expire_value='6h'
+%else
+expire_value='7d'
+%endif
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+    sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \
+        $repo || exit 1
+done
+
 # Install ostree remote config
 install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
+install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
+
+
+%check
+# Make sure all repo variables were substituted
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/*.repo; do
+    if grep -q AUTO_VALUE $repo; then
+        echo "ERROR: Repo $repo contains an unsubstituted placeholder value"
+        exit 1
+    fi
+done
+
+# Make sure correct repos were enabled/disabled
+enabled_repos=(fedora-cisco-openh264)
+disabled_repos=(fedora-updates-archive)
+%if %{rawhide_release} == %{version}
+enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
+disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular \
+  fedora-updates-testing fedora-updates-testing-modular)
+%else
+enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular)
+disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
+%if %{updates_testing_enabled}
+enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+%else
+disabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+%endif
+%endif
+
+for repo in ${enabled_repos[@]}; do
+    if ! grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
+        echo "ERROR: Repo $repo should have been enabled, but it isn't"
+        exit 1
+    fi
+done
+
+for repo in ${disabled_repos[@]}; do
+    if grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
+        echo "ERROR: Repo $repo should have been disabled, but it isn't"
+        exit 1
+    fi
+done
+
+# Make sure updates-testing is not enabled in a Final (stable) release
+%if "%{release}" >= "1"
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+    if grep -q 'enabled=1' $repo; then
+        echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't"
+        exit 1
+    fi
+done
+%endif
+
+# Make sure metadata_expire was correctly set
+%if "%{release}" < "1"
+expire_value='6h'
+%else
+expire_value='7d'
+%endif
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+    lines=$(grep '^metadata_expire=' $repo | sort | uniq)
+    if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then
+        echo "ERROR: Non-matching metadata_expire lines in $repo: $lines"
+        exit 1
+    fi
+    if test "$lines" != "metadata_expire=${expire_value}"; then
+        echo "ERROR: Wrong metadata_expire value in $repo: $lines"
+        exit 1
+    fi
+done
+
+# Make sure the Rawhide+1 key wasn't forgotten to be created
+rawhide_next=$((%{rawhide_release}+1))
+test -n "$rawhide_next" || exit 1
+if ! test -f $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then
+    echo "ERROR: GPG key for Fedora ${rawhide_next} is not present"
+    exit 1
+fi
+
+# Make sure the Rawhide+1 key is present in Rawhide repo files
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
+    gpg_lines=$(grep '^gpgkey=' $repo)
+    if test -z "$gpg_lines"; then
+        echo "ERROR: No gpgkey= lines in $repo"
+        exit 1
+    fi
+    while IFS= read -r line; do
+        if ! echo "$line" | grep -q "RPM-GPG-KEY-fedora-${rawhide_next}"; then
+            echo "ERROR: Fedora ${rawhide_next} GPG key missing in $repo"
+            exit 1
+        fi
+    done <<< "$gpg_lines"
+done
+
 
 %files
 %dir /etc/yum.repos.d
@@ -153,6 +327,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
+%files archive
+%config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo
+
 %files rawhide
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
@@ -166,10 +343,69 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
 %files ostree
 %dir /etc/ostree/remotes.d/
 /etc/ostree/remotes.d/fedora.conf
+/etc/ostree/remotes.d/fedora-compose.conf
+
+%files eln
+%config(noreplace) /etc/yum.repos.d/fedora-eln.repo
+
 
 %changelog
-* Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 33-0.1
-- Setup for rawhide being F33
+* Mon Feb 22 2021 Kamil Páral <kparal@redhat.com> - 32-13
+- sync with Rawhide (mainly gpg keys)
+
+* Tue Feb 09 2021 Mohan Boddu <mboddu@bhujji.com> - 32-12
+- Fixing archmap for F35
+
+* Thu Feb 04 2021 Mohan Boddu <mboddu@bhujji.com> - 32-11
+- Adding F35 key
+
+* Tue Oct 13 2020 Mohan Boddu <mboddu@bhujji.com> - 32-10
+- Disable eln repos on non rawhide release (sgallagh)
+
+* Tue Oct 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 32-9
+- Ensure that the ELN GPG key always points at the Rawhide key
+
+* Tue Oct 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 32-8
+- Update the ELN repos for the BaseOS and AppStream split
+
+* Mon Oct 05 2020 Dusty Mabe <dusty@dustymabe.com> - 32-7
+- Add the fedora-repos-archive subpackage.
+
+* Tue Aug 25 2020 Adam Williamson <awilliam@redhat.com> - 32-6
+- Add missing per-arch symlinks for F34 key
+
+* Thu Aug 06 2020 Mohan Boddu <mboddu@bhujji.com> - 32-5
+- Adding F34 key
+
+* Tue Jun 30 2020 Stephen Gallagher <sgallagh@redhat.com> - 32-4
+- Add optional repositories for ELN
+
+* Mon Jun 01 2020 Dusty Mabe <dusty@dustymabe.com> - 32-3
+- Add fedora compose ostree repo to fedora-repos-ostree
+
+* Mon Apr 13 2020 Stephen Gallagher <sgallagh@redhat.com> - 32-2
+- Add the release to the fedora-repos(NN) Provides:
+
+* Thu Apr 09 2020 Mohan Boddu <mboddu@bhujji.com> - 32-1
+- Setup for F32 Final
+- Disable testing repos
+
+* Thu Apr 09 2020 Kalev Lember <klember@redhat.com> - 32-0.8
+- Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck
+  (#1768206)
+- Use the same metadata_expire time for fedora-cisco-openh264 and -debuginfo
+- Remove enabled_metadata key for fedora-cisco-openh264
+
+* Sat Feb 22 2020 Neal Gompa <ngompa13@gmail.com> - 32-0.7
+- Enable fedora-cisco-openh264 repo by default
+- Dont pull in fedora-repos-rawhide (mohanboddu)
+
+* Wed Feb 19 2020 Adam Williamson <awilliam@redhat.com> - 32-0.6
+- Restore baseurl lines, but with example domain
+
+* Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 32-0.5
+- Disable rawhide repos
+- Enable fedora, updates, updates-testing repos
 
 * Tue Feb 11 2020 Mohan Boddu <mboddu@bhujji.com> - 32-0.4
 - Remove baseurl download.fp.o (puiterwijk)
diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo
new file mode 100644
index 0000000..4cc3551
--- /dev/null
+++ b/fedora-updates-archive.repo
@@ -0,0 +1,22 @@
+# This is a repo that contains all the old update packages from the
+# Fedora updates yum repository (i.e. the packages that have made it
+# to "stable"). This repo is needed for OSTree based systems where users
+# may be trying to layer packages on top of a base layer that doesn't
+# have the latest stable content. Since base layer content is locked
+# the package layering operation will fail unless there are older versions
+# of packages available.
+#
+# This repo is given a high cost in order to prefer the normal Fedora
+# yum repositories, which means only packages that can't be found
+# elsewhere will be downloaded from here.
+[updates-archive]
+name=Fedora $releasever - $basearch - Updates Archive
+baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/
+enabled=0
+metadata_expire=6h
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=True
+cost=10000 # default is 1000
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index b73258f..f5350a0 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -1,7 +1,8 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
+#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=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - 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
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
+#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 9dcedbb..3b9bfca 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -1,7 +1,8 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
+#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
+enabled=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates 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
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
+#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 db00456..91dc671 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -1,7 +1,8 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
+#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
+enabled=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates 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
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
+#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 3691dc4..80ccb4d 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -1,7 +1,8 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
+#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=AUTO_VALUE
 countme=1
 repo_gpgcheck=0
 type=rpm
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - 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
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
+#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 3e59790..66d4de7 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -1,9 +1,10 @@
 [fedora]
 name=Fedora $releasever - $basearch
+#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
+enabled=AUTO_VALUE
 countme=1
-#metadata_expire=7d
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -12,9 +13,10 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
+#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
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
@@ -23,9 +25,10 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
+#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
+metadata_expire=AUTO_VALUE
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1