diff --git a/flathub.json b/flathub.json
deleted file mode 100644
index 637604e..0000000
--- a/flathub.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "only-arches": ["x86_64"]
-}
diff --git a/im.riot.Riot.yaml b/im.riot.Riot.yaml
index c1a9097..8b0d560 100644
--- a/im.riot.Riot.yaml
+++ b/im.riot.Riot.yaml
@@ -5,6 +5,8 @@ runtime: org.freedesktop.Platform
 runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
 command: element
+rename-icon: element-desktop
+copy-icon: true
 separate-locales: false
 finish-args:
   # Version required to use the document-portal v4
@@ -49,31 +51,73 @@ cleanup:
   - /man
 modules:
   - shared-modules/libsecret/libsecret.json
+  - name: tcl
+    subdir: unix
+    build-options:
+      no-debuginfo: true
+    cleanup:
+      - '*'
+    sources:
+      - type: git
+        url: https://github.com/tcltk/tcl.git
+        tag: core-8-6-11
+        commit: 17b5b3e0201cdf92d3c125776e1b2dd453f225bd
+  - name: sqlcipher
+    rm-configure: true
+    config-opts:
+      - --enable-tempstore=yes
+      - --disable-tcl
+    build-options:
+      cflags: -DSQLITE_HAS_CODEC
+      ldflags: -lcrypto
+    sources:
+      - type: archive
+        url: https://github.com/sqlcipher/sqlcipher/archive/v4.3.0.tar.gz
+        sha256: fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f
+      - type: shell
+        commands:
+          - cp -p /usr/share/automake-*/config.{sub,guess} .
+      - type: script
+        dest-filename: autogen.sh
+        commands:
+          - AUTOMAKE="automake --foreign" autoreconf -vfi
   - name: riot
     buildsystem: simple
     build-commands:
+      - ar x element-desktop_*.deb
+      - rm element-desktop_*.deb
+      - tar xf data.tar.xz
+      - cp -r 'opt/Element' /app/Element
+      - 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
       - 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
-      - rm element.sh im.riot.Riot.desktop im.riot.Riot.metainfo.xml
-      - install -Dm644 resources/img/element.png /app/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
-      - mkdir /app/Element
-      - cp -r * /app/Element
-      - chmod -R a-s,go+rX,go-w "/app/Element"
     sources:
-      - type: archive
+      - type: file
         only-arches:
           - x86_64
-        url: https://packages.element.io/desktop/install/linux/glibc-x86-64/element-desktop-1.11.40.tar.gz
-        sha256: 0bead3ae9a229fd490f0cb98034a5ed301383c199ece52ef97c483e11bfff5f5
+        url: https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.40_amd64.deb
+        sha256: 010c99ed58010b7d54c961b54af30fcfe3aa364f85ad64d04fe2525cd7a628c0
+        x-checker-data:
+          type: html
+          url: https://packages.element.io/debian/pool/main/e/element-desktop/index.html
+          version-pattern: "element-desktop_([\\d\\.-]*)_amd64.deb"
+          url-template: "https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_${version}_amd64.deb"
+      - type: file
+        only-arches:
+          - aarch64
+        url: https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.40_arm64.deb
+        sha256: 17ba2ce882cce51885c91b38ef8e34ceee95ef80ddbedd8400ad4757e65cca74
         x-checker-data:
           type: html
-          url: https://packages.element.io/desktop/install/linux/glibc-x86-64/index.html
-          version-pattern: element-desktop-([\d\.-]*).tar.gz
-          url-template: https://packages.element.io/desktop/install/linux/glibc-x86-64/element-desktop-$version.tar.gz
+          url: https://packages.element.io/debian/pool/main/e/element-desktop/index.html
+          version-pattern: "element-desktop_([\\d\\.-]*)_arm64.deb"
+          url-template: "https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_${version}_arm64.deb"
       - type: file
         path: element.sh
       - type: file
         path: im.riot.Riot.metainfo.xml
       - type: file
-        path: im.riot.Riot.desktop
+        path: im.riot.Riot.desktop
\ No newline at end of file