diff --git a/content/_index.md b/content/_index.md
index 6c7bb0ea8ea4bb44ee8dbabb6f77fa9f5cbb5d83..f1ac08a5673f97d5cc77c4c894767ec236160b83 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -62,7 +62,7 @@ For more information, see [Release flow and product lines]( {{< ref "release-flo
## Further Links
* Current stable release: [v2021.0]( {{< ref "/release/v2021.0/releasenotes.md" >}} )
-* Current old stable release: [v2020.4]( {{< ref "/release/v2020.4/releasenotes.md" >}} )
+* Current old stable release: [v2020.5]( {{< ref "/release/v2020.5/releasenotes.md" >}} )
* Current development release: [v2022dev1]( {{< ref "/release/v2022dev1/releasenotes.md" >}} )
* [Further releases]( {{< ref "releases.md" >}} )
diff --git a/content/policies/releases.md b/content/policies/releases.md
index db05f4070d29240e73880f14ec71e5e87a00c1f9..1b47f70342b9739781be9770da0a6bd06eb03756 100644
--- a/content/policies/releases.md
+++ b/content/policies/releases.md
@@ -49,17 +49,18 @@ The latest releases are:
- v2022dev1: [release notes]( {{< ref "/release/v2022dev1/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2022dev1/release_schedule.md" >}} )
- v2021.0: [release notes]( {{< ref "/release/v2021.0/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2021.0/release_schedule.md" >}} )
- - v2020.4: [release notes]( {{< ref "/release/v2020.4/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2020.4/release_schedule.md" >}} )
+ - v2020.5: [release notes]( {{< ref "/release/v2020.5/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2020.5/release_schedule.md" >}} )
- v2019.7: [release notes]( {{< ref "/release/v2019.7/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2019.7/release_schedule.md" >}} )
The next releases will be:
- v2022dev2: [release schedule]( {{< ref "/release/v2022dev2/release_schedule.md" >}} )
- v2021.1: [release schedule]( {{< ref "/release/v2021.1/release_schedule.md" >}} )
- - v2020.5: [release schedule]( {{< ref "/release/v2020.5/release_schedule.md" >}} )
+ - v2020.6: [release schedule]( {{< ref "/release/v2020.6/release_schedule.md" >}} )
For previous releases see:
+ - v2020.4: [release notes]( {{< ref "/release/v2020.4/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2020.4/release_schedule.md" >}} )
- v2019.6: [release notes]( {{< ref "/release/v2019.6/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2019.6/release_schedule.md" >}} )
- v2022dev0: [release notes]( {{< ref "/release/v2022dev0/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2022dev0/release_schedule.md" >}} )
- v2021pre: [release notes]( {{< ref "/release/v2021pre/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2021pre/release_schedule.md" >}} )
diff --git a/content/release/v2020.5/releasenotes.md b/content/release/v2020.5/releasenotes.md
new file mode 100644
index 0000000000000000000000000000000000000000..36cb4e5130bf2abe531f246534c4eb7c0d0711aa
--- /dev/null
+++ b/content/release/v2020.5/releasenotes.md
@@ -0,0 +1,194 @@
++++
+date = "2021-06-14"
+weight = 100
+
+title = "v2020.5 Release notes"
++++
+
+Apertis is a Debian derivative distribution geared towards the creation
+of product-specific images for ARM (both the 32bit ARMv7 and 64-bit
+ARMv8 versions using the hardfloat ABI) and Intel x86-64 (64-bit)
+systems.
+
+**Apertis v2020.5** is the fifth **stable** release of the Apertis
+v2020 [release flow]( {{< ref "release-flow.md#apertis-release-flow" >}} ).
+Apertis is committed to maintaining the v2020 release stream until September 2021.
+
+This Apertis release is built on top of Debian Buster with several
+customisations and the Linux kernel 5.4.x LTS series.
+
+Test results for the v2020.5 release are available in the following test
+reports:
+
+ - [APT images](https://lavaphabbridge.apertis.org/report/v2020/20210603.0)
+ - [OSTree images](https://lavaphabbridge.apertis.org/report/v2020/20210603.0/ostree)
+ - [NFS artifacts](https://lavaphabbridge.apertis.org/report/v2020/20210603.0/nfs)
+ - [LXC containers](https://lavaphabbridge.apertis.org/report/v2020/20210603.0/lxc)
+
+Point releases including all the security fixes accumulated will be
+published quarterly, up to v2020.7.
+
+## Release flow
+
+ - 2019 Q3: v2020dev0
+ - 2019 Q4: v2020pre
+ - 2020 Q1: v2020.0
+ - 2020 Q2: v2020.1
+ - 2020 Q3: v2020.2
+ - 2020 Q4: v2020.3
+ - 2021 Q1: v2020.4
+ - 2021 Q2: **v2020.5**
+ - 2021 Q3: v2020.6
+ - 2021 Q4: v2020.7
+
+### Release downloads
+
+| [Apertis v2020.5 images](https://images.apertis.org/release/v2020/v2020.5/) | | | | |
+| --------------------------------------------------------------------------- |-|-|-|-|
+| Intel 64-bit | [minimal](https://images.apertis.org/release/v2020/v2020.5/amd64/minimal/apertis_v2020-minimal-amd64-uefi_v2020.5.img.gz) | [target](https://images.apertis.org/release/v2020/v2020.5/amd64/target/apertis_v2020-target-amd64-uefi_v2020.5.img.gz) | [base SDK](https://images.apertis.org/release/v2020/v2020.5/amd64/basesdk/apertis_v2020-basesdk-amd64-sdk_v2020.5.vdi.gz) | [SDK](https://images.apertis.org/release/v2020/v2020.5/amd64/sdk/apertis_v2020-sdk-amd64-sdk_v2020.5.vdi.gz)
+| ARM 32-bit (U-Boot) | [minimal](https://images.apertis.org/release/v2020/v2020.5/armhf/minimal/apertis_v2020-minimal-armhf-uboot_v2020.5.img.gz)
+| ARM 64-bit (U-Boot) | [minimal](https://images.apertis.org/release/v2020/v2020.5/arm64/minimal/apertis_v2020-minimal-arm64-uboot_v2020.5.img.gz)
+
+The Intel `minimal` and `target` images are tested on the
+[reference hardware (MinnowBoard MAX)]( {{< ref "/reference_hardware/_index.md" >}} ),
+but they can run on any UEFI-based x86-64 system. The `basesdk` and `sdk` images are
+[tested under VirtualBox]( {{< ref "/virtualbox.md" >}} ).
+
+#### Apertis v2020 package list
+
+* [v2020](https://infrastructure.pages.apertis.org/dashboard/tsv/index.html)
+
+
+#### Apertis v2020 repositories
+
+ deb https://repositories.apertis.org/apertis/ v2020 target development sdk hmi
+ deb https://repositories.apertis.org/apertis/ v2020-security target development sdk hmi
+
+## Changes
+
+This is a point release in the stable cycle, only security fixes and
+small changes are appropriate for this release stream.
+
+This release includes the security updates from Debian Buster and the latest
+LTS Linux kernel on the 5.4.x series.
+
+## Deprecations and ABI/API breaks
+
+### The GitLab-CI image building pipeline will replace the Jenkins pipeline
+
+The [GitLab-CI imabe building
+pipeline](https://gitlab.apertis.org/infrastructure/apertis-image-recipes/-/blob/apertis/v2020/.gitlab-ci.yml)
+is now available on the v2020 branch as well. It currently co-exist with the
+Jenkins pipeline which is still the reference pipeline for this Apertis
+release.
+
+During the v2020.5 cycle the project will evaluate having the GitLab-CI
+pipeline as the reference pipeline, putting the Jenkins pipeline into
+maintenance mode.
+
+## Infrastructure
+
+### Apertis Docker registry
+
+The Apertis Docker registry stores Docker images in order to provide a
+unified and easily reproducible build environment for developers and
+services.
+
+As of today, this includes the `apertis-image-builder`,
+`apertis-package-builder`, `apertis-package-source-builder`,
+`apertis-testcases-builder` and `apertis-documentation-builder` Docker
+images.
+
+### Apertis infrastructure tools
+
+The
+[Apertis v2020 infrastructure repository](https://build.collabora.co.uk/project/users/apertis:infrastructure:v2020)
+provides packages for the required versions of `ostree-push` and
+`ostree` for Debian Buster:
+
+ deb https://repositories.apertis.org/infrastructure-v2020/ buster infrastructure
+
+### Images
+
+Image daily builds, as well as release builds can be found at:
+
+ https://images.apertis.org/
+
+Image build tools can be found in the Apertis tools repositories.
+
+### Infrastructure overview
+
+The
+[Image build infrastructure document]( {{< ref "image-build-infrastructure.md" >}} )
+provides an overview of the image building process and the involved
+services.
+
+## Known issues
+
+### Normal (66)
+ - [T7984](https://phabricator.apertis.org/T7984) Rhoyssd test shows status as incomplete on v2021 images
+ - [T2896](https://phabricator.apertis.org/T2896) Crash when initialising egl on ARM target
+ - [T2930](https://phabricator.apertis.org/T2930) Develop test case for out of screen events in Wayland images
+ - [T3210](https://phabricator.apertis.org/T3210) Fix Tracker testcase to not download media files from random HTTP user folders
+ - [T3233](https://phabricator.apertis.org/T3233) Ribchester: deadlock when calling RemoveApp() right after RollBack()
+ - [T3321](https://phabricator.apertis.org/T3321) libgles2-vivante-dev is not installable
+ - [T3920](https://phabricator.apertis.org/T3920) arm-linux-gnueabihf-pkg-config does not work with sysroots installed by `ade`
+ - [T4092](https://phabricator.apertis.org/T4092) Containers fail to load on Gen4 host
+ - [T4293](https://phabricator.apertis.org/T4293) Preseed action is needed for Debos
+ - [T4307](https://phabricator.apertis.org/T4307) ribchester-core causes apparmor denies on non-btrfs minimal image
+ - [T4422](https://phabricator.apertis.org/T4422) do-branching fails at a late stage cloning OBS binary repos
+ - [T4444](https://phabricator.apertis.org/T4444) A 2-3 second lag between the speakers is observed when a hfp connection is made over bluetooth
+ - [T4693](https://phabricator.apertis.org/T4693) Not able to create namespace for AppArmor container on the internal mx6qsabrelite images with proprietary kernel
+ - [T5487](https://phabricator.apertis.org/T5487) Wi-Fi search button is missing in wifi application
+ - [T5748](https://phabricator.apertis.org/T5748) System users are shipped in /usr/etc/passwd instead of /lib/passwd
+ - [T5863](https://phabricator.apertis.org/T5863) Songs/Videos don't play on i.MX6 with Frampton on internal images
+ - [T5896](https://phabricator.apertis.org/T5896) sdk-dbus-tools-bustle testcase is failing
+ - [T5897](https://phabricator.apertis.org/T5897) apparmor-ofono test fails
+ - [T5900](https://phabricator.apertis.org/T5900) evolution-sync-bluetooth test fails
+ - [T5931](https://phabricator.apertis.org/T5931) connman-usb-tethering test fails
+ - [T6024](https://phabricator.apertis.org/T6024) folks-inspect: command not found
+ - [T6077](https://phabricator.apertis.org/T6077) youtube Videos are not playing on upstream webkit2GTK
+ - [T6078](https://phabricator.apertis.org/T6078) Page scroll is lagging in Minibrowser on upstream webkit2GTK
+ - [T6111](https://phabricator.apertis.org/T6111) traprain: 7_traprain test failed
+ - [T6243](https://phabricator.apertis.org/T6243) AppArmor ubercache support is no longer enabled after 18.12
+ - [T6291](https://phabricator.apertis.org/T6291) Generated lavaphabbridge error report email provides wrong link for full report link
+ - [T6292](https://phabricator.apertis.org/T6292) gettext-i18n: test failed
+ - [T6349](https://phabricator.apertis.org/T6349) sdk-code-analysis-tools-splint: 3_sdk-code-analysis-tools-splint test failed
+ - [T6366](https://phabricator.apertis.org/T6366) sdk-cross-compilation: 10_sdk-cross-compilation test failed
+ - [T6446](https://phabricator.apertis.org/T6446) aum-update-rollback-tests/amd64: DNS not available in LAVA tests after reboot
+ - [T6620](https://phabricator.apertis.org/T6620) Repeatedly plugging and unplugging a USB flash drive on i.MX6 (Sabrelite) results in USB failure
+ - [T6727](https://phabricator.apertis.org/T6727) FTBFS: Apertis v2020pre package build failures
+ - [T6768](https://phabricator.apertis.org/T6768) Fix the kernel command line generation in OSTRee for FIT image
+ - [T6773](https://phabricator.apertis.org/T6773) HAB testing: the unsigned image may pass validation in several circumstances
+ - [T6783](https://phabricator.apertis.org/T6783) Kernel trace on armhf board with attached screen
+ - [T6795](https://phabricator.apertis.org/T6795) SabreLite failing to boot due to failing "to start udev Coldplug all Devices"
+ - [T6806](https://phabricator.apertis.org/T6806) HAB on SabreLite in open state accepts any signed kernel regardless of the signing key
+ - [T6885](https://phabricator.apertis.org/T6885) gitlab-rulez fails to set location of the gitlab-ci.yaml on first run
+ - [T6961](https://phabricator.apertis.org/T6961) audio-backhandling feature fails
+ - [T7000](https://phabricator.apertis.org/T7000) DNS resolution does not work in Debos on some setups
+ - [T7012](https://phabricator.apertis.org/T7012) Apparmor Denied session logs keep popping up on the terminal while executing tests
+ - [T7016](https://phabricator.apertis.org/T7016) network proxy for browser application is not resolving on mildenhall-compositor
+ - [T7127](https://phabricator.apertis.org/T7127) apparmor-functional-demo: test fails on internal images
+ - [T7128](https://phabricator.apertis.org/T7128) apparmor-session-lockdown-no-deny
+ - [T7129](https://phabricator.apertis.org/T7129) apparmor-tumbler: test failed
+ - [T7333](https://phabricator.apertis.org/T7333) apparmor-geoclue: test failed
+ - [T7512](https://phabricator.apertis.org/T7512) debos sometimes fails to mount things
+ - [T7530](https://phabricator.apertis.org/T7530) ADE can't download amd64 sysroot.
+ - [T7617](https://phabricator.apertis.org/T7617) frome: test failed
+ - [T7721](https://phabricator.apertis.org/T7721) Fakemachine in debos immediately powers off and hangs in v2021 and v2022dev1 when using UML on the runners
+ - [T7776](https://phabricator.apertis.org/T7776) On executing system-update test on hawkbit-agent wrong delta is selected
+ - [T7785](https://phabricator.apertis.org/T7785) DNS over TLS does not work on systemd-resolve
+ - [T7812](https://phabricator.apertis.org/T7812) The dlt-daemon build in the devroot testcase fails due to lack of pandoc on Arm platforms
+ - [T7815](https://phabricator.apertis.org/T7815) scan-copyright fails to detect (L)GPL-3 code in util-linux
+ - [T7817](https://phabricator.apertis.org/T7817) rhosydd: test failed
+ - [T7819](https://phabricator.apertis.org/T7819) newport: test failed
+ - [T7826](https://phabricator.apertis.org/T7826) Kernel panic logs seen on apertis-update-manager-usb-unplug test on v2019/r-car with u-boot from v2021
+ - [T7827](https://phabricator.apertis.org/T7827) When creaing new test repositories `common-subtree.sh add` gets confused if the checked out branch does not exists in `tests/common`
+ - [T7828](https://phabricator.apertis.org/T7828) License scan fails on less.js due to package.json format not supported
+ - [T7829](https://phabricator.apertis.org/T7829) License scan fails on ghostscript due to spaces in filename confusing scan-copyrights
+ - [T7837](https://phabricator.apertis.org/T7837) Package httpcomponents-client fails in test case TestSSLSocketFactory
+ - [T7843](https://phabricator.apertis.org/T7843) Package node-grunt-legacy-log fails to build in OBS due to environment variables
+ - [T7849](https://phabricator.apertis.org/T7849) Error building package po4a in OBS
+ - [T7859](https://phabricator.apertis.org/T7859) spymemcached: Investigate failing test due to hostname mismatch
+ - [T7872](https://phabricator.apertis.org/T7872) Error building package ruby-redis on OBS
+ - [T7923](https://phabricator.apertis.org/T7923) Gitlab pipeline OBS job reported "success" but OBS build was "unresolvable"
diff --git a/content/release/v2020.6/release_schedule.md b/content/release/v2020.6/release_schedule.md
new file mode 100644
index 0000000000000000000000000000000000000000..ea5750d1a61e207ec7d36d951b547973d14f95e3
--- /dev/null
+++ b/content/release/v2020.6/release_schedule.md
@@ -0,0 +1,27 @@
++++
+date = "2021-06-17"
+weight = 100
+
+title = "v2020.6 Release schedule"
++++
+
+The v2020.6 release cycle started in June 2020.
+
+| Milestone | Date |
+| -------------------------------------------------------------------------------------------------------- | ----------------- |
+| Start of release cycle | 2021-06-17 |
+| Soft feature freeze: end of feature proposal and review period | 2021-08-18 |
+| Soft code freeze/hard feature freeze: end of feature development for this release, only bugfixes allowed | 2021-08-25 |
+| Release candidate 1 (RC1)/hard code freeze: no new code changes may be made after this date | 2021-09-01 |
+| RC testing | 2021-09-02..06-08 |
+| v2020.6 release | 2021-09-09 |
+
+If the release candidate 1 does not successfully pass all required
+tests, then the issues will be fixed and a new release candidate will be
+re-tested. This would delay the release, which would be reflected on
+this page.
+
+## See also
+
+ - Previous [release schedules]( {{< ref "/policies/releases.md" >}} ) and
+ more information about the timeline
diff --git a/data/releases.toml b/data/releases.toml
index 41f6c57d0fb1798c2f53a4e356ff16824775a275..9abdd7c05d0cd9fa69484c047026d46cd76f7b19 100644
--- a/data/releases.toml
+++ b/data/releases.toml
@@ -8,4 +8,4 @@ revision = "0"
[Old-stable]
version = "v2020"
-revision = "4"
+revision = "5"