diff --git a/content/_index.md b/content/_index.md
index f1ac08a5673f97d5cc77c4c894767ec236160b83..023c448887652d1b3e20167bfd4cba0fabd466ba 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -61,7 +61,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 stable release: [v2021.1]( {{< ref "/release/v2021.1/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 1b47f70342b9739781be9770da0a6bd06eb03756..b8a1323713904237e709dcc79a90cf8d1bf67987 100644
--- a/content/policies/releases.md
+++ b/content/policies/releases.md
@@ -48,18 +48,19 @@ and getting the support of two or more Apertis maintainers.
 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" >}} )
+  - v2021.1: [release notes]( {{< ref "/release/v2021.1/releasenotes.md" >}} ), [release schedule]( {{< ref "/release/v2021.1/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" >}} )
+  - v2021.2: [release schedule]( {{< ref "/release/v2021.2/release_schedule.md" >}} )
   - v2020.6: [release schedule]( {{< ref "/release/v2020.6/release_schedule.md" >}} )
 
 For previous releases see:
 
+  - 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" >}} )
   - 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" >}} )
diff --git a/content/release/v2021.1/releasenotes.md b/content/release/v2021.1/releasenotes.md
new file mode 100644
index 0000000000000000000000000000000000000000..138c64c8f8226cd86484777caee4087076a74a59
--- /dev/null
+++ b/content/release/v2021.1/releasenotes.md
@@ -0,0 +1,201 @@
++++
+date = "2021-06-28"
+weight = 100
+
+title = "v2021.1 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 v2021.1** is the second **stable** release of the Apertis v2021
+stable [release flow]( {{< ref "release-flow.md#apertis-release-flow" >}} ).
+Apertis is committed to maintaining the v2021 release stream up to the end
+of 2022.
+
+This Apertis release is built on top of Debian Buster with several
+customisations and the Linux kernel 5.10.x LTS series.
+
+Test results for the v2021.1 release are available in the following
+test reports:
+
+  - [APT     images](https://lavaphabbridge.apertis.org/report/v2021/20210618.0018)
+  - [OSTree  images](https://lavaphabbridge.apertis.org/report/v2021/20210618.0018/ostree)
+  - [NFS  artifacts](https://lavaphabbridge.apertis.org/report/v2021/20210618.0018/nfs)
+  - [LXC containers](https://lavaphabbridge.apertis.org/report/v2021/20210618.0018/lxc)
+
+Point releases including all the security fixes accumulated will be
+published quarterly, up to v2021.7.
+
+## Release flow
+
+  - 2019 Q4: v2021dev0
+  - 2020 Q1: v2021dev1
+  - 2020 Q2: v2021dev2
+  - 2020 Q3: v2021dev3
+  - 2020 Q4: v2021pre
+  - 2021 Q1: v2021.0
+  - **2021 Q2: v2021.1**
+  - 2021 Q3: v2021.2
+  - 2021 Q4: v2021.3
+  - 2022 Q1: v2021.4
+  - 2022 Q2: v2021.5
+  - 2022 Q3: v2021.6
+  - 2022 Q4: v2021.7
+
+### Release downloads
+
+| [Apertis v2021 images](https://images.apertis.org/release/v2021/) | | | | |
+| ------------------------------------------------------------------------- |-|-|-|-|
+
+| Intel 64-bit		| [minimal](https://images.apertis.org/release/v2021/v2021.1/amd64/minimal/apertis_v2021-minimal-amd64-uefi_v2021.1.img.gz) | [target](https://images.apertis.org/release/v2021/v2021.1/amd64/target/apertis_v2021-target-amd64-uefi_v2021.1.img.gz) | [base SDK](https://images.apertis.org/release/v2021/v2021.1/amd64/basesdk/apertis_v2021-basesdk-amd64-sdk_v2021.1.vdi.gz) | [SDK](https://images.apertis.org/release/v2021/v2021.1/amd64/sdk/apertis_v2021-sdk-amd64-sdk_v2021.1.vdi.gz)
+| ARM 32-bit (U-Boot)	| [minimal](https://images.apertis.org/release/v2021/v2021.1/armhf/minimal/apertis_v2021-minimal-armhf-uboot_v2021.1.img.gz) | [target](https://images.apertis.org/release/v2021/v2021.1/armhf/target/apertis_v2021-target-armhf-uboot_v2021.1.img.gz)
+| ARM 64-bit (U-Boot)	| [minimal](https://images.apertis.org/release/v2021/v2021.1/arm64/minimal/apertis_v2021-minimal-arm64-uboot_v2021.1.img.gz)
+| ARM 64-bit (Raspberry Pi)	| [minimal](https://images.apertis.org/release/v2021/v2021.1/arm64/minimal/apertis_v2021-minimal-arm64-rpi64_v2021.1.img.gz) | [target](https://images.apertis.org/release/v2021/v2021.1/arm64/target/apertis_v2021-target-arm64-rpi64_v2021.1.img.gz)
+
+The Intel `minimal` and `target` images are tested on the
+[reference hardware (MinnowBoard Turbot Dual-Core)]( {{< ref "/reference_hardware/amd64.md" >}} ),
+but they can run on any UEFI-based x86-64 system. The `sdk` image is
+[tested under VirtualBox]( {{< ref "/virtualbox.md" >}} ).
+
+#### Apertis v2021 package list
+
+* [v2021](https://infrastructure.pages.apertis.org/dashboard/tsv/index.html)
+
+
+#### Apertis v2021 repositories
+
+    deb https://repositories.apertis.org/apertis/ v2021 target development sdk hmi
+    deb https://repositories.apertis.org/apertis/ v2021-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.10.x series.
+
+## Deprecations and ABI/API breaks
+
+Being a point release, no new deprecations or ABI breaks are part of
+this release
+
+## Infrastructure
+
+### Apertis Docker images
+
+The Apertis Docker images provide a unified and easily reproducible build
+environment for developers and services.
+
+As of today, this includes the
+[`apertis-base`](docker://registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2021-base),
+[`apertis-image-builder`](docker://registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2021-image-builder),
+[`apertis-package-source-builder`](docker://registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2021-package-source-builder),
+[`apertis-flatdeb-builder`](docker://registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2021-flatdeb-builder),
+[`apertis-documentation-builder`](docker://registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2021-documentation-builder),
+and [`apertis-testcases-builder`](docker://registry.gitlab.apertis.org/infrastructure/apertis-docker-images/v2021-testcases-builder),
+Docker images.
+
+### Apertis infrastructure tools
+
+The [Apertis v2021 infrastructure repository](https://build.collabora.co.uk/project/users/apertis:infrastructure:v2021)
+provides packages for the required versions of `ostree-push` and
+`ostree` for Debian Buster:
+
+    deb https://repositories.apertis.org/infrastructure-v2021/ 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
+
+### High (8)
+ - [T7781](https://phabricator.apertis.org/T7781)	aum-ota-api: test failed due to new bootcount test needing a newer uboot
+ - [T7802](https://phabricator.apertis.org/T7802)	flatpak install -y org.apertis.mildenhall.Platform org.apertis.mildenhall.Sdk
+ - [T7879](https://phabricator.apertis.org/T7879)	sdk-debos-image-building: test failed
+ - [T7984](https://phabricator.apertis.org/T7984)	Rhosydd test shows status as incomplete on v2021 images
+ - [T8019](https://phabricator.apertis.org/T8019)	License information generated by ci-license-scan  is not deterministic
+ - [T8029](https://phabricator.apertis.org/T8029)	Unable to apply few of the gitlab-rulez for projects hosted on Gitlab
+
+### Normal (67)
+ - [T8042](https://phabricator.apertis.org/T8042)	bluez-setup test is failing in v2021 BaseSDK
+ - [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
+ - [T7815](https://phabricator.apertis.org/T7815)	ci-license-scan 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`
+ - [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
+ - [T7852](https://phabricator.apertis.org/T7852)	v2022dev2: Investigate test failure TestGetSourceMount
+ - [T7854](https://phabricator.apertis.org/T7854)	v2022dev2: FTBFS for package clisp in test streams.tst
+ - [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"
+ - [T7985](https://phabricator.apertis.org/T7985)	Errors are encountered when trying to install the ssl-cert & postfix packages for Rhoyssd test
+ - [T8039](https://phabricator.apertis.org/T8039)	scan-copyrights fails on packages with non ASCII information in package.json
+ - [T8058](https://phabricator.apertis.org/T8058)	Rhosydd test fails to launch  rhosydd-speedo-backend.service
+
diff --git a/content/release/v2021.2/release_schedule.md b/content/release/v2021.2/release_schedule.md
new file mode 100644
index 0000000000000000000000000000000000000000..921d2f926fe790f995e0866c65be79d4c0329a31
--- /dev/null
+++ b/content/release/v2021.2/release_schedule.md
@@ -0,0 +1,27 @@
++++
+date = "2021-06-28"
+weight = 100
+
+title = "v2021.2 Release schedule"
++++
+
+The v2021.2 release cycle started in July 2021.
+
+| Milestone                                                                                                | Date              |
+| -------------------------------------------------------------------------------------------------------- | ----------------- |
+| Start of release cycle                                                                                   | 2021-07-01        |
+| Soft feature freeze: end of feature proposal and review period                                           | 2021-08-25        |
+| Soft code freeze/hard feature freeze: end of feature development for this release, only bugfixes allowed | 2021-09-01        |
+| Release candidate 1 (RC1)/hard code freeze: no new code changes may be made after this date              | 2021-09-08        |
+| RC testing                                                                                               | 2021-09-09..06-15 |
+| v2021.1 release                                                                                          | 2021-09-16        |
+
+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 9abdd7c05d0cd9fa69484c047026d46cd76f7b19..48a2bc992d2eac6cbd50b19bab45aaf63f9ea677 100644
--- a/data/releases.toml
+++ b/data/releases.toml
@@ -4,7 +4,7 @@ revision = "0"
 
 [Stable]
 version = "v2021"
-revision = "0"
+revision = "1"
 
 [Old-stable]
 version = "v2020"