diff --git a/element.sh b/element-nightly.sh
similarity index 74%
rename from element.sh
rename to element-nightly.sh
index 2e99154..57fe6c9 100644
--- a/element.sh
+++ b/element-nightly.sh
@@ -7,4 +7,4 @@ then
     FLAGS="$FLAGS --disable-gpu-sandbox"
 fi
 
-env TMPDIR="$XDG_RUNTIME_DIR/app/${FLATPAK_ID:-im.riot.Riot}" zypak-wrapper /app/Element/element-desktop $FLAGS "$@"
\ No newline at end of file
+env TMPDIR="$XDG_RUNTIME_DIR/app/${FLATPAK_ID:-im.riot.Riot}" zypak-wrapper /app/Element-Nightly/element-desktop-nightly $FLAGS "$@"
\ No newline at end of file
diff --git a/im.riot.Riot.desktop b/im.riot.Riot.desktop
index 41be791..a802282 100644
--- a/im.riot.Riot.desktop
+++ b/im.riot.Riot.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
-Name=Element
+Name=Element Nightly
 Icon=im.riot.Riot
-Exec=/app/bin/element %U
+Exec=/app/bin/element-nightly %U
 Categories=Network;InstantMessaging;Chat;VideoConference;
 MimeType=x-scheme-handler/element;
-StartupWMClass=element
+StartupWMClass=element-nightly
 Keywords=Matrix;matrix.org;chat;irc;communications;talk;riot;vector;
diff --git a/im.riot.Riot.metainfo.xml b/im.riot.Riot.metainfo.xml
index 5259b91..60a39c0 100644
--- a/im.riot.Riot.metainfo.xml
+++ b/im.riot.Riot.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
   <id>im.riot.Riot.desktop</id>
-  <name>Element</name>
+  <name>Element Nightly</name>
   <project_license>Apache-2.0</project_license>
   <developer_name>New Vector Ltd</developer_name>
   <summary>Create, share, communicate, chat and call securely, and bridge to other apps</summary>
@@ -30,132 +30,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="1.10.10" date="2022-04-14"/>
-    <release version="1.10.9" date="2022-04-12"/>
-    <release version="1.10.8" date="2022-03-28"/>
-    <release version="1.10.7" date="2022-03-15"/>
-    <release version="1.10.6" date="2022-03-01"/>
-    <release version="1.10.5" date="2022-02-28"/>
-    <release version="1.10.4" date="2022-02-17"/>
-    <release version="1.10.3" date="2022-02-14"/>
-    <release version="1.10.1" date="2022-02-01"/>
-    <release version="1.10.0" date="2022-01-31"/>
-    <release version="1.9.9" date="2022-01-17"/>
-    <release version="1.9.8" date="2021-12-20"/>
-    <release version="1.9.7" date="2021-12-13" urgency="high">
-      <description>
-        <p>Fix for buffer overflow in libolm and matrix-js-sdk</p>
-        <p>Fix a crash on logout</p>
-      </description>
-      <issues>
-        <issue type="cve">CVE-2021-44538</issue>
-      </issues>
-    </release>
-    <release version="1.9.6" date="2021-12-06"/>
-    <release version="1.9.5" date="2021-11-22"/>
-    <release version="1.9.4" date="2021-11-08"/>
-    <release version="1.9.3" date="2021-10-25"/>
-    <release version="1.9.2" date="2021-10-12"/>
-    <release version="1.9.1" date="2021-10-11"/>
-    <release version="1.9.0" date="2021-09-27"/>
-    <release version="1.8.5" date="2021-09-14"/>
-    <release version="1.8.4" date="2021-09-13"/>
-    <release version="1.8.2" date="2021-08-31"/>
-    <release version="1.8.1" date="2021-08-17"/>
-    <release version="1.8.0" date="2021-08-16"/>
-    <release version="1.7.34" date="2021-08-02"/>
-    <release version="1.7.33" date="2021-07-19"/>
-    <release version="1.7.32" date="2021-07-05"/>
-    <release version="1.7.31" date="2021-06-21"/>
-    <release version="1.7.30" date="2021-06-07"/>
-    <release version="1.7.29" date="2021-05-24"/>
-    <release version="1.7.28" date="2021-05-17"/>
-    <release version="1.7.27" date="2021-05-10"/>
-    <release version="1.7.26" date="2021-04-27"/>
-    <release version="1.7.25" date="2021-04-12"/>
-    <release version="1.7.24" date="2021-03-29"/>
-    <release version="1.7.23" date="2021-03-15"/>
-    <release version="1.7.22" date="2021-03-01"/>
-    <release version="1.7.21" date="2021-02-16"/>
-    <release version="1.7.20" date="2021-02-04"/>
-    <release version="1.7.18" date="2021-01-26"/>
-    <release version="1.7.17" date="2021-01-18"/>
-    <release version="1.7.16" date="2020-12-21"/>
-    <release version="1.7.15" date="2020-12-07"/>
-    <release version="1.7.14" date="2020-11-23"/>
-    <release version="1.7.13" date="2020-11-09"/>
-    <release version="1.7.12" date="2020-10-28"/>
-    <release version="1.7.11" date="2020-10-27"/>
-    <release version="1.7.10" date="2020-10-20"/>
-    <release version="1.7.9" date="2020-10-12"/>
-    <release version="1.7.8" date="2020-09-29"/>
-    <release version="1.7.7" date="2020-09-14"/>
-    <release version="1.7.5" date="2020-09-01"/>
-    <release version="1.7.4" date="2020-08-17"/>
-    <release version="1.7.3" date="2020-08-05"/>
-    <release version="1.7.2" date="2020-07-27"/>
-    <release version="1.7.1" date="2020-07-16"/>
-    <release version="1.7.0" date="2020-07-15"/>
-    <release version="1.6.8" date="2020-07-03"/>
-    <release version="1.6.7" date="2020-06-29"/>
-    <release version="1.6.6" date="2020-06-23"/>
-    <release version="1.6.5" date="2020-06-16"/>
-    <release version="1.6.4" date="2020-06-05"/>
-    <release version="1.6.3" date="2020-06-04"/>
-    <release version="1.6.2" date="2020-05-22"/>
-    <release version="1.6.1" date="2020-05-19"/>
-    <release version="1.6.0" date="2020-05-05"/>
-    <release version="1.5.15" date="2020-04-01"/>
-    <release version="1.5.14" date="2020-03-30"/>
-    <release version="1.5.13" date="2020-03-17"/>
-    <release version="1.5.12" date="2020-03-04"/>
-    <release version="1.5.10" date="2020-02-19"/>
-    <release version="1.5.8" date="2020-01-27"/>
-    <release version="1.5.7" date="2020-01-13"/>
-    <release version="1.5.6" date="2019-12-09"/>
-    <release version="1.5.5" date="2019-11-27"/>
-    <release version="1.5.4" date="2019-11-25"/>
-    <release version="1.5.3" date="2019-11-06"/>
-    <release version="1.5.1" date="2019-11-04"/>
-    <release version="1.5.0" date="2019-10-18"/>
-    <release version="1.4.2" date="2019-10-04"/>
-    <release version="1.4.1" date="2019-10-01"/>
-    <release version="1.4.0" date="2019-09-27"/>
-    <release version="1.3.5" date="2019-09-16"/>
-    <release version="1.3.0" date="2019-07-19"/>
-    <release version="1.2.4" date="2019-07-11"/>
-    <release version="1.2.3" date="2019-07-08"/>
-    <release version="1.2.2" date="2019-06-19"/>
-    <release version="1.2.1" date="2019-05-31"/>
-    <release version="1.2.0" date="2019-05-29"/>
-    <release version="1.1.2" date="2019-05-16"/>
-    <release version="1.1.1" date="2019-05-14"/>
-    <release version="1.1.0" date="2019-05-07"/>
-    <release version="1.0.7" date="2019-04-08"/>
-    <release version="1.0.6" date="2019-04-01"/>
-    <release version="1.0.5" date="2019-03-21"/>
-    <release version="1.0.4" date="2019-03-19"/>
-    <release version="1.0.3" date="2019-03-11"/>
-    <release version="1.0.1" date="2019-02-15"/>
-    <release version="0.17.9" date="2019-01-22"/>
-    <release version="0.17.8" date="2019-01-10"/>
-    <release version="0.17.6" date="2018-11-19"/>
-    <release version="0.17.3" date="2018-10-29"/>
-    <release version="0.17.0" date="2018-10-16"/>
-    <release version="0.16.5" date="2018-10-01"/>
-    <release version="0.16.4" date="2018-09-10"/>
-    <release version="0.16.3" date="2018-09-03"/>
-    <release version="0.16.2" date="2018-08-23"/>
-    <release version="0.16.0" date="2018-07-30"/>
-    <release version="0.15.7" date="2018-07-09"/>
-    <release version="0.15.6" date="2018-06-29"/>
-    <release version="0.15.4" date="2018-05-25"/>
-    <release version="0.15.3" date="2018-05-18"/>
-    <release version="0.14.1" date="2018-04-12"/>
-    <release version="0.14.0" date="2018-04-11"/>
-    <release version="0.13.5" date="2018-02-09"/>
-    <release version="0.13.4" date="2018-01-03"/>
-    <release version="0.13.0" date="2017-11-15"/>
+    <release version="2022040701" date="2022-04-07"/>
   </releases>
   <content_rating type="oars-1.1">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/im.riot.Riot.yaml b/im.riot.Riot.yaml
index f59f560..653e103 100644
--- a/im.riot.Riot.yaml
+++ b/im.riot.Riot.yaml
@@ -4,8 +4,8 @@ base-version: '21.08'
 runtime: org.freedesktop.Platform
 runtime-version: '21.08'
 sdk: org.freedesktop.Sdk
-command: element
-rename-icon: element-desktop
+command: element-nightly
+rename-icon: element-desktop-nightly
 copy-icon: true
 separate-locales: false
 finish-args:
@@ -34,6 +34,8 @@ finish-args:
   - --own-name=org.kde.StatusNotifierItem-2-1
   # Required for advanced input methods e.g. writing CJK languages
   - --talk-name=org.freedesktop.portal.Fcitx
+  # Required to store access tokens (persistent logins)
+  - --filesystem=xdg-run/keyring
   # Required for experimental wayland support
   - --filesystem=xdg-run/pipewire-0
 cleanup:
@@ -83,30 +85,30 @@ modules:
   - name: riot
     buildsystem: simple
     build-commands:
-      - ar x element-desktop_*.deb
-      - rm element-desktop_*.deb
+      - ar x element-nightly_*.deb
+      - rm element-nightly_*.deb
       - tar xf data.tar.xz
-      - cp -r 'opt/Element' /app/Element
+      - cp -r 'opt/Element-Nightly' /app/Element-Nightly
       - mkdir -p /app/share/icons/hicolor
       - cp -r usr/share/icons/hicolor/* /app/share/icons/hicolor
-      - chmod -R a-s,go+rX,go-w "/app/Element"
-      - install element.sh /app/bin/element
+      - chmod -R a-s,go+rX,go-w "/app/Element-Nightly"
+      - install element-nightly.sh /app/bin/element-nightly
       - install -Dm644 im.riot.Riot.desktop /app/share/applications/im.riot.Riot.desktop
       - install -Dm644 im.riot.Riot.metainfo.xml /app/share/metainfo/im.riot.Riot.metainfo.xml
     sources:
       - type: file
         only-arches:
           - x86_64
-        url: https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.10.10_amd64.deb
-        sha256: 15a25637bcb5c8ff29bae789f3d9d590299c3d591103a1fb28d20d289e7d2c74
+        url: https://packages.element.io/debian/pool/main/e/element-nightly/element-nightly_2022040701_amd64.deb
+        sha256: 869e341244c2259d7b604cb768e6836f0903e650800e203895de7a21fe73c4ca
         x-checker-data:
           type: debian-repo
-          package-name: element-desktop
+          package-name: element-nightly
           root: https://packages.element.io/debian
           dist: sid
           component: main
       - type: file
-        path: element.sh
+        path: element-nightly.sh
       - type: file
         path: im.riot.Riot.metainfo.xml
       - type: file