diff --git a/releases.yaml b/releases.yaml
index e4bb440e1bb..ea3accc71e3 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -1,11 +1,12 @@
 latest:
-  slug: GroovyGorilla
-  name: "Groovy Gorilla"
-  short_version: "20.10"
-  full_version: "20.10"
-  release_date: "October 2020"
-  eol: "July 2021"
+  slug: HirsuteHippo
+  name: "Hirsute Hippo"
+  short_version: "21.04"
+  full_version: "21.04"
+  release_date: "April 2021"
+  eol: "January 2022"
   past_eol_date: false
+  release_notes_url: "https://discourse.ubuntu.com/t/hirsute-hippo-release-notes/19221"
 lts:
   slug: FocalFossa
   name: "Focal Fossa"
@@ -14,6 +15,7 @@ lts:
   full_version_desktop: "20.04.2.0"
   release_date: "April 2020"
   eol: "April 2025"
+  release_notes_url: "https://wiki.ubuntu.com/FocalFossa/ReleaseNotes"
 openstack_lts:
   slug: Ussuri
 previous_lts:
@@ -29,16 +31,16 @@ previous_previous_lts:
 
 checksums:
   desktop:
-    "20.10": "3ef833828009fb69d5c584f3701d6946f89fa304757b7947e792f9491caa270e *ubuntu-20.10-desktop-amd64.iso"
+    "21.04": "fa95fb748b34d470a7cfa5e3c1c8fa1163e2dc340cd5a60f7ece9dc963ecdf88 *ubuntu-21.04-desktop-amd64.iso"
     "20.04.2.0": "93bdab204067321ff131f560879db46bee3b994bf24836bb78538640f689e58f *ubuntu-20.04.2.0-desktop-amd64.iso"
   live-server:
-    "20.10": "defdc1ad3af7b661fe2b4ee861fb6fdb5f52039389ef56da6efc05e6adfe3d45 *ubuntu-20.10-live-server-amd64.iso"
+    "21.04": "e4089c47104375b59951bad6c7b3ee5d9f6d80bfac4597e43a716bb8f5c1f3b0 *ubuntu-21.04-live-server-amd64.iso"
     "20.04.2": "d1f2bf834bbe9bb43faf16f9be992a6f3935e65be0edece1dee2aa6eb1767423 *ubuntu-20.04.2-live-server-amd64.iso"
   desktop-arm64+raspi:
-    "20.10": "2fa19fb53fe0144549ff722d9cd755d9c12fb508bb890926bfe7940c0b3555e8 *ubuntu-20.10-preinstalled-desktop-arm64+raspi.img.xz"
+    "21.04": "d89ee327a00b98d7166b1a8cc95d17762aaacd3b4d0fc756c5b6b65df1708f48 *ubuntu-21.04-preinstalled-desktop-arm64+raspi.img.xz"
   server-arm64+raspi:
-    "20.10": "73a98e83fbb6398f86902c7a83c826536f1afbd0be2d80cb0d7faa94ede33137 *ubuntu-20.10-preinstalled-server-arm64+raspi.img.xz"
+    "21.04": "3df85b93b66ccd2d370c844568b37888de66c362eebae5204bf017f6f5875207 *ubuntu-21.04-preinstalled-server-arm64+raspi.img.xz"
     "20.04.2": "31884b07837099a5e819527af66848a9f4f92c1333e3ef0693d6d77af66d6832 *ubuntu-20.04.2-preinstalled-server-arm64+raspi.img.xz"
   server-armhf+raspi:
-    "20.10": "941752f93313ba765069b48f38af18bbf961bebefcc9c4296a953cf1260f0fe1 *ubuntu-20.10-preinstalled-server-armhf+raspi.img.xz"
+    "21.04": "c9a9a5177a03fcbb6203b38e5c3c4e5447fd9e8891515da4146f319f04eb3495 *ubuntu-21.04-preinstalled-server-armhf+raspi.img.xz"
     "20.04.2": "7b348d080648b8e36e1f29671afd973a0878503091b935b69828f2c7722dfb58 *ubuntu-20.04.2-preinstalled-server-armhf+raspi.img.xz"
diff --git a/templates/appliance/shared/_featured_appliances.html b/templates/appliance/shared/_featured_appliances.html
index 348b690b53c..2594ef2f2bd 100644
--- a/templates/appliance/shared/_featured_appliances.html
+++ b/templates/appliance/shared/_featured_appliances.html
@@ -5,76 +5,76 @@ <h2 class="p-muted-heading">{{ heading }}</h2>
   </div>
   {% endif %}
   <div class="col-2">
-    <a href="/appliance/openhab" class="p-link--soft">
-      <h3 class="p-heading--five u-no-padding--top">OpenHAB</h3>
-      <hr />
-      <div class="u-align--center">
+    <a href="/appliance/openhab">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">OpenHAB</p>
+      <hr>
+      <div class="u-hide--small">
         {{
           image(
             url="https://assets.ubuntu.com/v1/fa5dd451-OpenHAB.png",
             alt="",
             height="32",
-            width="146",
+            width="148",
             hi_def=True,
             loading="lazy",
-            attrs={"style": "margin-top: 2rem;"}
+            attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           ) | safe
         }}
       </div>
     </a>
   </div>
   <div class="col-2">
-    <a href="/appliance/plex" class="p-link--soft">
-      <h3 class="p-heading--five u-no-padding--top">Plex<span class="u-hide--medium"> Media Server</span></h3>
-      <hr />
-      <div class="u-align--center">
+    <a href="/appliance/plex">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">Plex<span class="u-hide--medium"> Media Server</span></p>
+      <hr>
+      <div class="u-hide--small">
         {{
           image(
             url="https://assets.ubuntu.com/v1/3cd85693-Plex.png",
             alt="",
-            height="32",
-            width="99",
+            height="27",
+            width="84",
             hi_def=True,
             loading="lazy",
-            attrs={"style": "margin-top: 2rem;"}
+            attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           ) | safe
         }}
       </div>
     </a>
   </div>
   <div class="col-2">
-    <a href="/appliance/nextcloud" class="p-link--soft">
-      <h3 class="p-heading--five u-no-padding--top">Nextcloud</h3>
-      <hr />
-      <div class="u-align--center">
+    <a href="/appliance/nextcloud">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">Nextcloud</p>
+      <hr>
+      <div class="u-hide--small">
         {{
           image(
-            url="https://assets.ubuntu.com/v1/d3a211c9-Nextcloud.png",
+            url="https://assets.ubuntu.com/v1/99a0b969-Nextcloud_Logo.svg",
             alt="",
-            height="62",
-            width="87",
+            height="48",
+            width="73",
             hi_def=True,
             loading="lazy",
-            attrs={"style": "margin-top: 1.25rem;"}
+            attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           ) | safe
         }}
       </div>
     </a>
   </div>
   <div class="col-2">
-    <a href="/appliance/adguard" class="p-link--soft">
-      <h3 class="p-heading--five u-no-padding--top">AdGuard</h3>
-      <hr />
-      <div class="u-align--center">
+    <a href="/appliance/adguard">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">AdGuard</p>
+      <hr>
+      <div class="u-hide--small">
         {{
           image(
-            url="https://assets.ubuntu.com/v1/1ec45573-AdGuard.png",
+            url="https://assets.ubuntu.com/v1/b430a72e-adguard_logo.svg",
             alt="",
-            height="62",
-            width="62",
+            height="32",
+            width="145",
             hi_def=True,
             loading="lazy",
-            attrs={"style": "margin-top: 1.25rem;"}
+            attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           ) | safe
         }}
       </div>
@@ -82,19 +82,19 @@ <h3 class="p-heading--five u-no-padding--top">AdGuard</h3>
   </div>
   {% if request.path == "/appliance/vm" %}
   <div class="col-2">
-    <a href="/appliance/mosquitto" class="p-link--soft">
-      <h3 class="p-heading--five u-no-padding--top">Mosquitto</h3>
-      <hr />
-      <div class="u-align--center">
+    <a href="/appliance/mosquitto">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">Mosquitto</p>
+      <hr>
+      <div class="u-hide--small">
         {{
           image(
             url="https://assets.ubuntu.com/v1/c2c39a7a-mosquitto-logo.png",
             alt="",
-            height="72",
-            width="72",
+            height="48",
+            width="48",
             hi_def=True,
             loading="lazy",
-            attrs={"style": "margin-top: 1rem;"}
+            attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           ) | safe
         }}
       </div>
@@ -102,19 +102,19 @@ <h3 class="p-heading--five u-no-padding--top">Mosquitto</h3>
   </div>
   {% else %}
   <div class="col-2">
-    <a href="/appliance/lxd" class="p-link--soft">
-      <h3 class="p-heading--five u-no-padding--top">LXD</h3>
-      <hr />
-      <div class="u-align--center">
+    <a href="/appliance/lxd">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">LXD</p>
+      <hr>
+      <div class="u-hide--small">
         {{
           image(
-            url="https://assets.ubuntu.com/v1/3a24a2f9-lxd.png",
+            url="https://assets.ubuntu.com/v1/ac9a0e00-lxd_primary.svg",
             alt="",
-            height="72",
-            width="72",
+            height="32",
+            width="97",
             hi_def=True,
             loading="lazy",
-            attrs={"style": "margin-top: 1rem;"}
+            attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           ) | safe
         }}
       </div>
diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html
index ee97ae8cbac..49f09856d3a 100755
--- a/templates/desktop/developers.html
+++ b/templates/desktop/developers.html
@@ -76,16 +76,21 @@ <h2>What's new in Ubuntu {{ releases.latest.short_version }}?</h2>
     </div>
     <div class="u-fixed-width">
       <ul class="p-list is-split">
-        <li class="p-list__item is-ticked">Support for the Raspberry Pi 4 with 4GB and 8GB RAM</li>
-        <li class="p-list__item is-ticked">Linux 5.8 kernel</li>
-        <li class="p-list__item is-ticked">GNOME Desktop 3.38 with all the latest features</li>
-        <li class="p-list__item is-ticked">Uniquely generated QR codes for sharing private WiFi hotspots</li>
-        <li class="p-list__item is-ticked">LibreOffice 7.0</li>
-        <li class="p-list__item is-ticked">Thunderbird email client integrated calendar and user friendly PGP encryption</li>
-        <li class="p-list__item is-ticked">Improved settings for battery percentage and microphone mute status</li>
-        <li class="p-list__item is-ticked">New photographic and Raspberry Pi themed wallpapers</li>
+        <li class="p-list__item is-ticked">Linux 5.11 kernel</li>
+        <li class="p-list__item is-ticked">Redesigned Yaru dark GNOME shell theme is the default</li>
+        <li class="p-list__item is-ticked">New MIME type icons in the Yaru theme</li>
+        <li class="p-list__item is-ticked">Wayland is the default display server with improved security and performance</li>
+        <li class="p-list__item is-ticked">Active directory integration is included in the installer</li>
+        <li class="p-list__item is-ticked">Improved UI with new power profile modes</li>
+        <li class="p-list__item is-ticked">Recovery key option for encrypted installs</li>
+        <li class="p-list__item is-ticked">Private home directory</li>
+        <li class="p-list__item is-ticked">LibreOffice 7.1.2, Python 3.9, Firefox 87, GNOME Desktop 3.38.5</li>
       </ul>
-      <p><a class="p-link--external" href="https://discourse.ubuntu.com/t/groovy-gorilla-release-notes/15533">Read the full release notes</a></p>
+      <p>
+        <a href="{{ releases.latest.release_notes_url }}">
+          Read the full release notes&nbsp;&rsaquo;
+        </a>
+      </p>
     </div>
   </section>
 
@@ -108,7 +113,11 @@ <h2>What's new in Ubuntu {{ releases.lts.short_version }} LTS?</h2>
         <li class="p-list__item is-ticked">LibreOffice 6.4</li>
         <li class="p-list__item is-ticked">nVIDIA hardware is now supported out of the box</li>
       </ul>
-      <p><a class="p-link--external" href="https://wiki.ubuntu.com/{{ releases.lts.slug }}/ReleaseNotes">Read the full release notes</a></p>
+      <p>
+        <a class="p-link--external" href="{{ releases.lts.release_notes_url }}">
+          Read the full release notes
+        </a>
+      </p>
     </div>
   </section>
 
diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html
index 5b0707b78bb..49c63cc7ee4 100755
--- a/templates/download/desktop/index.html
+++ b/templates/download/desktop/index.html
@@ -17,7 +17,7 @@ <h2>Ubuntu {{ releases.lts.full_version_desktop }} LTS</h2>
     <div class="row u-equal-height p-divider u-no-padding--left u-no-padding--right">
       <div class="col-8 p-divider__block">
         <p class="u-no-padding--top">Download the latest <abbr title="Long-term support">LTS</abbr> version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support &mdash; which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.</p>
-        <p><a href="https://wiki.ubuntu.com/{{ releases.lts.slug }}/ReleaseNotes" class="p-link--external">Ubuntu {{ releases.lts.short_version }} LTS release notes</a></p>
+        <p><a href="{{ releases.lts.release_notes_url }}" class="p-link--external">Ubuntu {{ releases.lts.short_version }} LTS release notes</a></p>
         <p>Recommended system requirements:</p>
         <ul class="p-list is-split">
           <li class="p-list__item is-ticked">2 GHz dual core processor or better</li>
@@ -50,7 +50,7 @@ <h2>Ubuntu {{ releases.latest.full_version }}</h2>
       <div class="col-8 p-divider__block">
         <p class="u-no-padding--top">The latest version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{ releases.latest.full_version }} comes with nine months, until {{ releases.latest.eol }}, of security and maintenance updates.</p>
         <p>Recommended system requirements are the same as for Ubuntu {{ releases.lts.full_version }} <abbr title="Long-term support">LTS</abbr>.</p>
-        <p><a href="https://wiki.ubuntu.com/{{ releases.latest.slug }}/ReleaseNotes" class="p-link--external">Ubuntu {{ releases.latest.short_version }} release notes</a></p>
+        <p><a href="{{ releases.latest.release_notes_url }}" class="p-link--external">Ubuntu {{ releases.latest.short_version }} release notes</a></p>
       </div>
       <div class="col-4">
         <p>
diff --git a/templates/download/index.html b/templates/download/index.html
index 2e41feffe7e..06be9a715d8 100755
--- a/templates/download/index.html
+++ b/templates/download/index.html
@@ -35,26 +35,17 @@ <h2>
       </p>
     </div>
     <div class="col-6 u-align--center u-hide--small">
-      {{
-        image(
-        url="https://assets.ubuntu.com/v1/817b07bd-GG-FF-download-mascots.svg",
+      {{ image (
+        url="https://assets.ubuntu.com/v1/cae223aa-HH-FF-download-mascots.svg",
         alt="",
-        height="600",
-        width="1382",
+        width="504",
+        height="143",
         hi_def=True,
         loading="auto"
         ) | safe
       }}
     </div>
   </div>
-  <div class="row">
-    <div class="p-heading-icon">
-      <div class="p-heading-icon__header">
-        <img src="https://assets.ubuntu.com/v1/58442bcb-business-promo-webinar.png" alt="Find out what's new in Ubuntu 20.10 in our webinar" class="p-heading-icon__img" style="width:64px;">
-        <h4 class="p-heading-icon__title" style="padding-top:0.4rem"><a href="/engage/ubuntu-20.10?utm_source=Download&amp;utm_medium=Download&amp;utm_campaign=7013z000001WldOAAS">Find out what's new in Ubuntu 20.10 in our webinar</a></h4>
-      </div>
-    </div>
-  </div>
   <div class="row">
     <div class="col-12">
       <hr style="margin: 0 0 3rem 0;">
@@ -64,12 +55,12 @@ <h4 class="p-heading-icon__title" style="padding-top:0.4rem"><a href="/engage/ub
     <div class="col-1 u-hide--small u-vertically-center u-align--center">
       {{
         image(
-            url="https://assets.ubuntu.com/v1/ea34f006-Multipass+logomark_rgb.svg",
-            alt="Ubuntu",
-            width="40",
-            height="40",
-            hi_def=True,
-            loading="auto",
+        url="https://assets.ubuntu.com/v1/ea34f006-Multipass+logomark_rgb.svg",
+        alt="Ubuntu",
+        width="40",
+        height="40",
+        hi_def=True,
+        loading="auto",
         ) | safe
       }}
     </div>
@@ -82,12 +73,12 @@ <h4 class="p-heading-icon__title" style="padding-top:0.4rem"><a href="/engage/ub
     <div class="col-1 u-hide--small u-vertically-center u-align--center">
       {{
         image(
-            url="https://assets.ubuntu.com/v1/08563efa-picto-windows.svg",
-            alt="Windows",
-            width="40",
-            height="40",
-            hi_def=True,
-            loading="auto",
+        url="https://assets.ubuntu.com/v1/08563efa-picto-windows.svg",
+        alt="Windows",
+        width="40",
+        height="40",
+        hi_def=True,
+        loading="auto",
         ) | safe
       }}
     </div>
diff --git a/templates/download/raspberry-pi/index.html b/templates/download/raspberry-pi/index.html
index d7f33d2eedb..3ac714fa88e 100644
--- a/templates/download/raspberry-pi/index.html
+++ b/templates/download/raspberry-pi/index.html
@@ -12,9 +12,15 @@
 <section class="p-strip--suru-bottomed">
   <div class="row u-vertically-center">
     <div class="col-7">
-      <h1>Install Ubuntu <br class="u-hide--small">on a Raspberry Pi</h1>
-      <p>Running Ubuntu on your Raspberry Pi is easy. Just pick the OS image you want, flash it onto a microSD card, load it onto your Pi and away you go.</p>
-      <p>First time installing Ubuntu on Raspberry Pi?</p>
+      <h1>
+        Install Ubuntu <br class="u-hide--small">on a Raspberry Pi
+      </h1>
+      <p>
+        Running Ubuntu on your Raspberry Pi is easy. Just pick the OS image you want, flash it onto a microSD card, load it onto your Pi and away you go.
+      </p>
+      <p>
+        First time installing Ubuntu on Raspberry Pi?
+      </p>
       <p>
         Follow our <a href="/tutorials/how-to-install-ubuntu-desktop-on-raspberry-pi-4">desktop</a> or <a href="/tutorials/how-to-install-ubuntu-on-your-raspberry-pi">server</a> tutorials.
       </p>
@@ -33,190 +39,257 @@ <h1>Install Ubuntu <br class="u-hide--small">on a Raspberry Pi</h1>
     </div>
   </div>
 </section>
-<section class="p-strip u-hide--small">
-  <div class="row u-equal-height u-vertically-center">
-    <div class="col-start-large-2 col-2">
+
+{# server lts #}
+<section class="p-strip--light {% if releases.latest.short_version < releases.lts.short_version %}is-bordered{% endif %}">
+  <div class="row">
+    <div class="col-6">
+      <h2 class="u-sv2">
+        Download Ubuntu Server
+      </h2>
+      <p class="p-muted-heading">
+        Recommended server
+      </p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-6">
+      <h3>
+        Ubuntu Server {{ releases.lts.full_version }} LTS
+      </h3>
+      <p>
+        The version of Ubuntu with five years of long term support, until {{ releases.lts.eol }}.
+      </p>
+      <p>
+        <a class="p-button--positive" href="/download/raspberry-pi/thank-you?version={{ releases.lts.full_version }}&amp;architecture=server-arm64+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 64-bit - server', 'eventLabel' : '{{ releases.lts.short_version }}', 'eventValue' : undefined });">
+          Download 64-bit
+        </a>
+        <a class="p-button" href="/download/raspberry-pi/thank-you?version={{ releases.lts.full_version }}&amp;architecture=server-armhf+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 32-bit - server', 'eventLabel' : '{{ releases.lts.short_version }}', 'eventValue' : undefined });">
+          Download 32-bit
+        </a>
+      </p>
+    </div>
+
+    {# server latest #}
+    {% if releases.latest.short_version > releases.lts.short_version %}
+    <div class="col-6">
+      <h3>
+        Ubuntu Server {{ releases.latest.full_version }}
+      </h3>
+      <p>
+        The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.
+      </p>
+      <p>
+        <a class="p-button--positive" href="/download/raspberry-pi/thank-you?version={{ releases.latest.full_version }}&amp;architecture=server-arm64+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 64-bit - server', 'eventLabel' : '{{ releases.latest.short_version }}', 'eventValue' : undefined });">
+          Download 64-bit
+        </a>
+        <a class="p-button" href="/download/raspberry-pi/thank-you?version={{ releases.latest.full_version }}&amp;architecture=server-armhf+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 32-bit - server', 'eventLabel' : '{{ releases.lts.short_version }}', 'eventValue' : undefined });">
+          Download 32-bit
+        </a>
+      </p>
+    </div>
+    {% endif %}
+  </div>
+
+  <div class="row u-hide--medium u-hide--large">
+    <div class="col-6">
+      <p>Works on:</p>
+      <ul class="p-list is-split">
+        <li class="p-list__item is-ticked">Raspberry Pi 2 - <em>32-bit only</em></li>
+        <li class="p-list__item is-ticked">Raspberry Pi 3</li>
+        <li class="p-list__item is-ticked">Raspberry Pi 4</li>
+        <li class="p-list__item is-ticked">Raspberry Pi 400</li>
+        <li class="p-list__item is-ticked">Raspberry Pi CM4</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="u-fixed-width u-hide--small">
+    <h4>
+      Works on:
+    </h4>
+  </div>
+  <div class="row u-hide--small">
+    <div class="col-2">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+        Raspberry Pi 2
+      </p>
+      <hr>
       <div>
         {{
           image(
           url="https://assets.ubuntu.com/v1/8542c958-Raspberry+Pi+2.png",
           alt="",
-          height="156",
-          width="236",
+          height="48",
+          width="72",
           hi_def=True,
+          attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           loading="auto"
           ) | safe
         }}
       </div>
+      <h6 class="u-text-light">
+        <em>
+          * 32-bit only
+        </em>
+      </h6>
     </div>
     <div class="col-2">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+        Raspberry Pi 3
+      </p>
+      <hr>
       <div>
         {{
           image(
           url="https://assets.ubuntu.com/v1/c4a007b6-Raspberry+Pi+3.png",
           alt="",
-          height="151",
-          width="236",
+          height="48",
+          width="75",
           hi_def=True,
+          attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           loading="auto"
           ) | safe
         }}
       </div>
     </div>
     <div class="col-2">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+        Raspberry Pi 4
+      </p>
+      <hr>
       <div>
         {{
           image(
           url="https://assets.ubuntu.com/v1/a999bb5f-Raspberry+Pi+4.png",
           alt="",
-          height="151",
-          width="236",
+          height="48",
+          width="75",
           hi_def=True,
+          attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
           loading="auto"
           ) | safe
         }}
       </div>
     </div>
     <div class="col-2">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+        Raspberry Pi 400
+      </p>
+      <hr>
       <div>
-        {{
-          image(
-          url="https://assets.ubuntu.com/v1/9df28d88-RPI_400_rotated.png",
+        {{ image (
+          url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png",
           alt="",
-          height="92",
-          width="127",
+          height="48",
+          width="93",
           hi_def=True,
-          loading="auto"
+          attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
+          loading="lazy"
           ) | safe
         }}
       </div>
     </div>
     <div class="col-2">
+      <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+        Raspberry Pi CM4
+      </p>
+      <hr>
       <div>
         {{ image (
-          url="https://assets.ubuntu.com/v1/22136bb8-pi-cm4-removebg-preview.png",
+          url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png",
           alt="",
-          width="344",
-          height="222",
+          height="48",
+          width="68",
           hi_def=True,
-          loading="auto|lazy"
+          attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
+          loading="lazy"
           ) | safe
         }}
       </div>
     </div>
   </div>
-  <div class="row u-vertically-center u-sv3">
-    <div class="col-start-large-2 col-2">
-      <p class="u-no-margin--bottom"><strong>Raspberry Pi 2</strong></p>
-    </div>
-    <div class="col-2">
-      <p class="u-no-margin--bottom"><strong>Raspberry Pi 3</strong></p>
-    </div>
-    <div class="col-2">
-      <p class="u-no-margin--bottom"><strong>Raspberry Pi 4</strong></p>
-    </div>
-    <div class="col-2">
-      <p class="u-no-margin--bottom"><strong>Raspberry Pi 400</strong></p>
-    </div>
-    <div class="col-2">
-      <p class="u-no-margin--bottom"><strong>Raspberry Pi CM4</strong></p>
-    </div>
-  </div>
 </section>
 
-{# server lts row #}
-<section class="p-strip--light u-no-padding--bottom {% if releases.latest.short_version < releases.lts.short_version %}is-bordered{% endif %}">
-  <div class="row">
-    <h2>Ubuntu Server {{ releases.lts.full_version }} LTS</h2>
-    <p class="p-muted-heading">Recommended server</p>
+
+{# desktop latest #}
+<section class="p-strip">
+  <div class="u-fixed-width">
+    <h2>
+      Download Ubuntu Desktop
+    </h2>
   </div>
-  <div class="row u-equal-height p-divider">
-    <div class="col-8 p-divider__block">
-      <p>The version of Ubuntu with long term support, until {{ releases.lts.eol }}.</p>
-      <p>Works on:</p>
-      <ul class="p-list is-split">
-        <li class="p-list__item is-ticked">Raspberry Pi 2 - <em>32-bit only</em></li>
-        <li class="p-list__item is-ticked">Raspberry Pi 3</li>
-        <li class="p-list__item is-ticked">Raspberry Pi 4</li>
-        <li class="p-list__item is-ticked">Raspberry Pi 400</li>
-        <li class="p-list__item is-ticked">Raspberry Pi CM4</li>
-      </ul>
-    </div>
-    <div class="col-4">
+  <div class="row">
+    <div class="col-6">
+      <h3>
+        Ubuntu Desktop {{ releases.latest.full_version }}
+      </h3>
       <p>
-        <a class="p-button--positive is-wide" href="/download/raspberry-pi/thank-you?version={{ releases.lts.full_version }}&amp;architecture=server-arm64+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 64-bit - server', 'eventLabel' : '{{ releases.lts.short_version }}', 'eventValue' : undefined });">Download 64-bit</a>
+        The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.
       </p>
       <p>
-        <a class="p-button is-wide" href="/download/raspberry-pi/thank-you?version={{ releases.lts.full_version }}&amp;architecture=server-armhf+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 32-bit - server', 'eventLabel' : '{{ releases.lts.short_version }}', 'eventValue' : undefined });">Download 32-bit</a>
-      </p>
-    </div>
-  </div>
-
-  {# server latest row #}
-
-  {% if releases.latest.short_version > releases.lts.short_version %}
-  <div class="p-strip is-shallow">
-    <div class="u-fixed-width">
-      <hr>
-    </div>
-  </div>
-
-  <div class="u-fixed-width">
-    <h2>Ubuntu Server {{ releases.latest.full_version }}</h2>
-  </div>
-  <div class="row u-equal-height p-divider">
-    <div class="col-8 p-divider__block">
-      <p>The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.</p>
+        <a
+        class="p-button--positive"
+        href="/download/raspberry-pi/thank-you?version={{ releases.latest.full_version }}&amp;architecture=desktop-arm64+raspi"
+        onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 64-bit - desktop', 'eventLabel' : '{{ releases.latest.short_version }}', 'eventValue' : undefined });">
+        Download 64-bit
+      </a>
+    </p>
+    <div class="u-hide--medium u-hide--large">
       <p>Works on:</p>
       <ul class="p-list is-split">
-        <li class="p-list__item is-ticked">Raspberry Pi 2 - <em>32-bit only</em></li>
-        <li class="p-list__item is-ticked">Raspberry Pi 3</li>
-        <li class="p-list__item is-ticked">Raspberry Pi 4</li>
         <li class="p-list__item is-ticked">Raspberry Pi 400</li>
         <li class="p-list__item is-ticked">Raspberry Pi CM4</li>
       </ul>
     </div>
-    <div class="col-4">
-      <p>
-        <a class="p-button--positive is-wide" href="/download/raspberry-pi/thank-you?version={{ releases.latest.full_version }}&amp;architecture=server-arm64+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 64-bit - server', 'eventLabel' : '{{ releases.latest.short_version }}', 'eventValue' : undefined });">Download 64-bit</a>
-      </p>
-      <p>
-        <a class="p-button is-wide" href="/download/raspberry-pi/thank-you?version={{ releases.latest.full_version }}&amp;architecture=server-armhf+raspi" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 32-bit - server', 'eventLabel' : '{{ releases.lts.short_version }}', 'eventValue' : undefined });">Download 32-bit</a>
-      </p>
-    </div>
   </div>
-  {% endif %}
-</section>
-
+</div>
 
-{# desktop latest #}
-<section class="p-strip">
-  <div class="u-fixed-width">
-    <h2>Ubuntu Desktop {{ releases.latest.full_version }}</h2>
-  </div>
-  <div class="row u-equal-height p-divider">
-    <div class="col-8 p-divider__block">
-      <p>The latest development release of Ubuntu with nine months of support, until {{ releases.latest.eol }}.</p>
-      <p>Works on:</p>
-      <ul class="p-list is-split">
-        <li class="p-list__item is-ticked">Raspberry Pi 4</li>
-        <li class="p-list__item is-ticked">Raspberry Pi 400</li>
-      </ul>
+<div class="u-fixed-width u-hide--small">
+  <h4>
+    Works on:
+  </h4>
+</div>
+<div class="row u-hide--small">
+  <div class="col-2">
+    <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+      Raspberry Pi 400
+    </p>
+    <hr>
+    <div>
+      {{ image (
+        url="https://assets.ubuntu.com/v1/cfdcd6c7-Raspberry-Pi-400-back--1536x1097.png",
+        alt="",
+        height="48",
+        width="93",
+        hi_def=True,
+        attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
+        loading="lazy"
+        ) | safe
+      }}
     </div>
-    <div class="col-4">
-      <p>
-        <a
-        class="p-button--positive is-wide"
-        href="/download/raspberry-pi/thank-you?version={{ releases.latest.full_version }}&amp;architecture=desktop-arm64+raspi"
-        onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Download', 'eventAction' : 'Raspberry Pi 64-bit - desktop', 'eventLabel' : '{{ releases.latest.short_version }}', 'eventValue' : undefined });">
-        Download 64-bit
-      </a>
+  </div>
+  <div class="col-2">
+    <p class="u-no-padding--top" style="margin-bottom: .5rem;">
+      Raspberry Pi CM4
     </p>
+    <hr>
+    <div>
+      {{ image (
+        url="https://assets.ubuntu.com/v1/3be8f179-Raspberry-Pi-CM4.png",
+        alt="",
+        height="48",
+        width="68",
+        hi_def=True,
+        attrs={"class": "u-align--left", "style": "margin-top: 1rem;"},
+        loading="lazy"
+        ) | safe
+      }}
+    </div>
   </div>
 </div>
 </section>
 
-
 <section class="p-strip--light">
   <div class="row">
     <div class="col-6">
diff --git a/templates/download/server/step2.html b/templates/download/server/step2.html
index 4fd5dc7d503..6c7867472c1 100755
--- a/templates/download/server/step2.html
+++ b/templates/download/server/step2.html
@@ -26,12 +26,12 @@ <h2 class="js-download-option">
       <div class="u-hide--small u-align--center">
         {{
           image(
-            url="https://assets.ubuntu.com/v1/28e0ebb7-Focal-Fossa-gradient-outline.svg",
-            alt="",
-            height="1500",
-            width="1922",
-            hi_def=True,
-            loading="lazy"
+          url="https://assets.ubuntu.com/v1/28e0ebb7-Focal-Fossa-gradient-outline.svg",
+          alt="",
+          height="1500",
+          width="1922",
+          hi_def=True,
+          loading="lazy"
           ) | safe
         }}
       </div>
@@ -39,7 +39,7 @@ <h2 class="js-download-option">
   </div>
   <div class="row">
     <div class="col-12">
-      <ul class="p-inline-list">
+      <ul class="p-inline-list u-no-margin--bottom">
         <li class="p-inline-list__item">
           <form action="/download/server" method="post" class="p-inline-list__item" style="display: inline">
             <input type="hidden" name="version" value="{{ releases.lts.full_version }}">
@@ -52,6 +52,11 @@ <h2 class="js-download-option">
         <li class="p-inline-list__item"><a href="#downloads">Alternative downloads&nbsp;&rsaquo;</a></li>
         <li class="p-inline-list__item"><a href="#architectures">Alternative architectures&nbsp;&rsaquo;</a></li>
       </ul>
+      <p class="u-sv3">
+        <a href="{{ releases.lts.release_notes_url }}" class="p-link--external">
+          Download Ubuntu Server {{ releases.lts.short_version }} LTS release notes
+        </a>
+      </p>
     </div>
 
   </div>
@@ -95,28 +100,27 @@ <h3>
         <input type="hidden" name="next-step" value="download">
         <button type="submit" class="p-button--positive" onclick="dataLayer.push({'event' : 'GAEvent', 'eventCategory' : 'Server download', 'eventAction' : 'Select option', 'eventLabel' : 'Manual install - latest', 'eventValue' : undefined });">Download Ubuntu Server {{ releases.latest.full_version }}</button>
       </form>
-
       <p>
-        <a href="https://www.brighttalk.com/webcast/6793/448578?utm_source=brighttalk-portal&utm_medium=web&utm_content=ubuntu%2020.10&utm_campaign=webcasts-search-results-feed" class="p-link--external">
-          Watch the webinar - "What's new in Ubuntu 20.10?"
+        <a href="/engage/ubuntu-21.04-release-webinar?utm_source=brighttalk-portal&utm_medium=web&utm_content=ubuntu%2021.04&utm_campaign=webcasts-server-download">
+          Watch the webinar - "What's new in Ubuntu Server 21.04?"&nbsp;&rsaquo;
         </a>
       </p>
 
       <p>
-        <a href="https://wiki.ubuntu.com/{{ releases.latest.slug }}/ReleaseNotes" class="p-link--external">
-          Download Ubuntu Server {{ releases.latest.short_version }} release notes
+        <a href="{{ releases.latest.release_notes_url }}">
+          Download Ubuntu Server {{ releases.latest.short_version }} release notes&nbsp;&rsaquo;
         </a>
       </p>
     </div>
     <div class="col-4 col-start-large-8 u-hide--small u-align--center u-vertically-center">
-      {{
-        image(
-          url="https://assets.ubuntu.com/v1/fe951eda-20.10_Groovy+Gorilla_RPi_Sketch.svg",
-          alt="",
-          height="237",
-          width="153",
-          hi_def=True,
-          loading="lazy"
+
+      {{ image (
+        url="https://assets.ubuntu.com/v1/2e66eda7-Hirsuit_Hippo_Colour.svg",
+        alt="",
+        width="300",
+        height="128",
+        hi_def=True,
+        loading="lazy"
         ) | safe
       }}
     </div>
diff --git a/templates/server/index.html b/templates/server/index.html
index e309a7408d6..ce66136bdb6 100755
--- a/templates/server/index.html
+++ b/templates/server/index.html
@@ -19,8 +19,8 @@ <h1>Scale out with Ubuntu Server</h1>
         </a>
       </p>
       <p>
-        <a class="p-link--external p-link--inverted" href="https://www.brighttalk.com/webcast/6793/398353/ubuntu-20-04-lts-whats-new-in-server">
-          Watch the webinar - "Ubuntu 20.04 LTS: What's new in server?"
+        <a class="p-link--inverted" href="/engage/ubuntu-21.04-release-webinar">
+          Watch the webinar - "What's new in Ubuntu Server 21.04?"&nbsp;&rsaquo;
         </a>
       </p>
     </div>
@@ -46,17 +46,17 @@ <h2>
     </h2>
     <ul class="p-list is-split">
       <li class="p-list__item is-ticked">Supported by Canonical until {{ releases.latest.eol }}</li>
+      <li class="p-list__item is-ticked">Ability to convert Debian Installer (DI) preseed scripts into Ubuntu Server Live Installer artifacts</li>
+      <li class="p-list__item is-ticked">APT phased updates for regressions monitoring and immediate elimination</li>
+      <li class="p-list__item is-ticked">Stability updates to the high availability (HA) stack, including pacemaker and corosync</li>
+      <li class="p-list__item is-ticked">The latest stable Linux 5.11 kernel for the latest hardware and security updates</li>
       <li class="p-list__item is-ticked">Runs on all major architectures - x86-64, ARM v7, ARM64, POWER8, POWER9, IBM s390x (LinuxONE) and RISC-V</li>
-      <li class="p-list__item is-ticked">Nftables-based backend for ufw for improved performance and easier administration</li>
-      <li class="p-list__item is-ticked">Support for OVS schema modelling in Netplan for an advanced networking stack configuration</li>
-      <li class="p-list__item is-ticked">Native configuration for WireGuard VPN in Netplan</li>
-      <li class="p-list__item is-ticked">The latest long-term Linux 5.8 kernel for the latest hardware and security updates</li>
-      <li class="p-list__item is-ticked">Updates to QEMU (5.0), libvirt (6.6), PHP (7.4.9), Apache2 (2.4.46), GCC (1.189), Python (3.8.6), Bind9 (9.16.6)</li>
+      <li class="p-list__item is-ticked">Updates to QEMU (5.2), libvirt (7.0), PHP (7.4.9), Apache2 (2.4.46), nginx (1.18), GCC (1.189), Python (3.9.2), Bind9 (9.16.8)</li>
     </ul>
     <p>
-      <a class="p-link--external"
-      href="https://discourse.ubuntu.com/t/groovy-gorilla-release-notes/15533">
-      Read more in the release notes
+      <a
+      href="{{ releases.latest.release_notes_url }}">
+        Read more in the release notes&nbsp;&rsaquo;
       </a>
     </p>
   </div>
@@ -83,8 +83,8 @@ <h2>
     </ul>
     <p>
       <a class="p-link--external"
-      href="https://wiki.ubuntu.com/{{ releases.lts.slug }}/ReleaseNotes">
-      Read more in the release notes
+      href="{{ releases.lts.release_notes_url }}">
+        Read more in the release notes&nbsp;&rsaquo;
       </a>
     </p>
   </div>