diff --git a/.gitmodules b/.gitmodules
index 606abc1d..6be3a4a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "external/nextcloud-uppush"]
 	path = external/nextcloud-uppush
 	url = https://github.com/UP-NextPush/server-app.git
+[submodule "external/flathub-shared-modules"]
+	path = external/flathub-shared-modules
+	url = https://github.com/flathub/shared-modules.git
diff --git a/external/flathub-shared-modules b/external/flathub-shared-modules
new file mode 160000
index 00000000..a2441b96
--- /dev/null
+++ b/external/flathub-shared-modules
@@ -0,0 +1 @@
+Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
diff --git a/packages/app/.gitignore b/packages/app/.gitignore
index 0fa6b675..8b7bed4a 100644
--- a/packages/app/.gitignore
+++ b/packages/app/.gitignore
@@ -44,3 +44,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+.flatpak-builder/
\ No newline at end of file
diff --git a/packages/app/de.provokateurin.neon.yaml b/packages/app/de.provokateurin.neon.yaml
new file mode 100644
index 00000000..5fed29fd
--- /dev/null
+++ b/packages/app/de.provokateurin.neon.yaml
@@ -0,0 +1,30 @@
+app-id: de.provokateurin.neon
+runtime: org.freedesktop.Platform
+runtime-version: '22.08'
+sdk: org.freedesktop.Sdk
+command: nextcloud-neon
+finish-args:
+  - --share=ipc
+  - --socket=fallback-x11
+  - --socket=wayland
+  - --share=network
+  - --device=dri
+modules:
+  - ../../external/flathub-shared-modules/libappindicator/libappindicator-gtk3-12.10.json
+  - name: nextcloud-neon
+    buildsystem: simple
+    build-commands:
+      - mkdir -p /app/nextcloud-neon/{data,lib}
+      - cp nextcloud-neon /app/nextcloud-neon/
+      - cp *.so /app/nextcloud-neon/lib/
+      - cp -r flutter_assets icudtl.dat /app/nextcloud-neon/data/
+      - ln -s /usr/lib/x86_64-linux-gnu/libsqlite3.so.0 /app/lib/libsqlite3.so
+      - if [ ! -e '/app/lib/libsqlite3.so' ]; then ln -s -f /usr/lib/aarch64-linux-gnu/libsqlite3.so.0 /app/lib/libsqlite3.so; fi
+      - ln -sf /app/nextcloud-neon/nextcloud-neon /app/bin/nextcloud-neon
+    sources:
+      - type: file
+        path: build/linux/x64/release/bundle/nextcloud-neon
+      - type: dir
+        path: build/linux/x64/release/bundle/lib/
+      - type: dir
+        path: build/linux/x64/release/bundle/data/