diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json
index 6850bcc3b..b7561d9c8 100644
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -8,6 +8,15 @@
     "tags": [
         "nightly"
     ],
+    "sdk-extensions": [
+        "org.freedesktop.Sdk.Extension.rust-stable"
+    ],
+    "build-options": {
+        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "build-args" : [
+            "--share=network"
+        ]
+    },
     "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=network",
@@ -40,23 +49,6 @@
                 }
             ]
         },
-        {
-            "name": "olm",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DOLM_TESTS=OFF" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.matrix.org/matrix-org/olm.git",
-                    "tag": "3.2.10",
-                    "x-checker-data": {
-                        "type": "git",
-                        "tag-pattern": "^([\\d.]+)$"
-                    },
-                    "commit": "9908862979147a71dc6abaecd521be526ae77be1"
-                }
-            ]
-        },
         {
             "name": "libsecret",
             "buildsystem": "meson",
@@ -103,6 +95,31 @@
                 "-DBUILD_TRANSLATIONS=NO"
             ]
         },
+        {
+            "name": "corrosion-rs",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/corrosion-rs/corrosion.git",
+                    "branch": "master"
+                }
+            ]
+        },
+        {
+            "name": "vodozemac-cpp",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/tobiasfella/vodozemac-cpp.git",
+                    "branch": "main"
+                }
+            ],
+            "config-opts": [
+                "-DBUILD_SHARED_LIBS=false"
+            ]
+        },
         {
             "name": "libQuotient",
             "buildsystem": "cmake-ninja",
@@ -110,7 +127,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "0.8.x",
+                    "branch": "tobias/vodozemac",
                     "disable-submodules": true
                 }
             ],
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70ccf8467..50567e573 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.8.2)
+find_package(QuotientQt6 0.9)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"
@@ -113,11 +113,6 @@ set_package_properties(QuotientQt6 PROPERTIES
     PURPOSE "Talk with matrix server"
 )
 
-if (NOT TARGET Olm::Olm)
-    message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
-endif()
-
-
 find_package(cmark)
 set_package_properties(cmark PROPERTIES
     TYPE REQUIRED