diff --git a/org.zotero.Zotero.json b/org.zotero.Zotero.json
deleted file mode 100644
index 7127fbc..0000000
--- a/org.zotero.Zotero.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "id": "org.zotero.Zotero",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "23.08",
-  "sdk": "org.freedesktop.Sdk",
-  "command": "zotero",
-  "rename-desktop-file": "zotero.desktop",
-  "rename-icon": "zotero",
-  "finish-args": [
-    "--socket=x11",
-    "--share=ipc",
-    "--share=network",
-    "--filesystem=home",
-    "--filesystem=xdg-desktop",
-    "--filesystem=xdg-documents",
-    "--filesystem=xdg-download",
-    "--filesystem=xdg-music",
-    "--filesystem=xdg-pictures",
-    "--filesystem=xdg-public-share",
-    "--filesystem=xdg-videos"
-  ],
-  "modules": [
-    "shared-modules/dbus-glib/dbus-glib.json",
-    {
-      "name": "zotero",
-      "buildsystem": "simple",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://download.zotero.org/client/release/6.0.27/Zotero-6.0.27_linux-x86_64.tar.bz2",
-          "sha512": "558154c0458a6d820af62dbedd70dba99150a7e4a612685579c03efffe41338fe9606099ddffcc33ce29141754621b6ef547de470fdbfc8ebcffc179c7f11a40",
-          "only-arches": [
-            "x86_64"
-          ]
-        },
-        {
-          "type": "archive",
-          "url": "https://download.zotero.org/client/release/6.0.27/Zotero-6.0.27_linux-i686.tar.bz2",
-          "sha512": "7ee3d746d08980638402391f275094be545e7aaf6e5713d9dee4dddd921aace177cd29ee4e2965d39805d5ddcfbb3d68c025fae4a612fa23337104429dec467d",
-          "only-arches": [
-            "i386"
-          ]
-        },
-        {
-          "type": "file",
-          "path": "org.zotero.Zotero.appdata.xml"
-        }
-      ],
-      "build-commands": [
-        "mkdir -p /app/{bin,share}",
-        "cp -R . /app/share/zotero",
-        "install -D chrome/icons/default/default16.png /app/share/icons/hicolor/16x16/apps/zotero.png",
-        "install -D chrome/icons/default/default32.png /app/share/icons/hicolor/32x32/apps/zotero.png",
-        "install -D chrome/icons/default/default48.png /app/share/icons/hicolor/48x48/apps/zotero.png",
-        "install -D chrome/icons/default/default256.png /app/share/icons/hicolor/256x256/apps/zotero.png",
-        "desktop-file-install --dir=/app/share/applications --set-key=Exec --set-value='zotero -url %U' --set-key=Icon --set-value=org.zotero.Zotero --remove-key=SingleMainWindow --set-key=X-GNOME-SingleWindow --set-value=true --add-mime-type=x-scheme-handler/zotero zotero.desktop",
-        "install -D org.zotero.Zotero.appdata.xml /app/share/appdata/org.zotero.Zotero.appdata.xml",
-        "ln -s /app/share/zotero/zotero /app/bin/zotero",
-        "sed -i 's/pref(\"app.update.enabled\", true);/pref(\"app.update.enabled\", false);/' /app/share/zotero/defaults/preferences/prefs.js"
-      ]
-    }
-  ]
-}
diff --git a/org.zotero.Zotero.yaml b/org.zotero.Zotero.yaml
new file mode 100644
index 0000000..3368a48
--- /dev/null
+++ b/org.zotero.Zotero.yaml
@@ -0,0 +1,55 @@
+id: org.zotero.Zotero
+runtime: org.freedesktop.Platform
+runtime-version: "23.08"
+sdk: org.freedesktop.Sdk
+command: zotero
+rename-desktop-file: zotero.desktop
+finish-args:
+  - --filesystem=home
+  - --filesystem=xdg-desktop
+  - --filesystem=xdg-documents
+  - --filesystem=xdg-download
+  - --filesystem=xdg-music
+  - --filesystem=xdg-pictures
+  - --filesystem=xdg-public-share
+  - --filesystem=xdg-videos
+  - --share=ipc
+  - --share=network
+  - --socket=fallback-x11
+  - --socket=wayland
+modules:
+  - shared-modules/dbus-glib/dbus-glib.json
+  - name: zotero
+    buildsystem: simple
+    sources:
+      - type: archive
+        url: https://download.zotero.org/client/beta/7.0.0-beta.46%2Bc27bac2ad/Zotero-7.0.0-beta.46%2Bc27bac2ad_linux-x86_64.tar.bz2
+        sha512: 4190f1ed880118d9301fe963810ad67235a2ecabbce0d5c946c96c0b49dcebc9e8615426c9d175a4e504de262ff118f34b5c82b76dc2b97a2105c844a3f4b885
+        only-arches:
+          - x86_64
+      - type: archive
+        url: https://download.zotero.org/client/beta/7.0.0-beta.46%2Bc27bac2ad/Zotero-7.0.0-beta.46%2Bc27bac2ad_linux-i686.tar.bz2
+        sha512: aeb86ed29e6e88707b2cd33a783af4afadc09e1d51567d8e0654cdced891fb1f56f6dcd6a0d7f6f33b6089ef6cb18dd09d5727d769ce3c28f5aaa45ff74e6fa9
+        only-arches:
+          - i386
+      - type: file
+        path: org.zotero.Zotero.appdata.xml
+    build-commands:
+      - 'mkdir -p /app/{bin,share}'
+      - cp -R . /app/share/zotero
+      - install -D chrome/icons/default/default16.png /app/share/icons/hicolor/16x16/apps/${FLATPAK_ID}.png
+      - install -D chrome/icons/default/default32.png /app/share/icons/hicolor/32x32/apps/${FLATPAK_ID}.png
+      - install -D chrome/icons/default/default48.png /app/share/icons/hicolor/48x48/apps/${FLATPAK_ID}.png
+      - install -D chrome/icons/default/default256.png /app/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
+      - >-
+        desktop-file-install
+        --dir=/app/share/applications
+        --set-key=Exec --set-value='zotero -url %U'
+        --set-key=Icon --set-value=org.zotero.Zotero
+        --add-mime-type=x-scheme-handler/zotero
+        zotero.desktop
+      - install -D org.zotero.Zotero.appdata.xml /app/share/appdata/${FLATPAK_ID}.appdata.xml
+      - ln -s /app/share/zotero/zotero /app/bin/zotero
+      # TODO: Find out how to correctly disable the auto-updater in Zotero 7
+      # The command below has no effect
+      # - echo "pref("app.update.auto", false);" >> /app/share/zotero/app/prefs.js