diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 61104d517..1bd301866 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,7 +1,7 @@
 name: fluffychat
 title: FluffyChat
 base: core24
-version: git
+version: 1.27.0
 license: AGPL-3.0
 summary: The cutest messenger in the Matrix network
 description: |
@@ -51,21 +51,48 @@ platforms:
     build-on: arm64
 
 parts:
+  flutter-git:
+    source: https://github.com/flutter/flutter.git
+    source-tag: 3.32.2
+    source-depth: 1
+    plugin: nil
+    override-build: |
+      mkdir -p $CRAFT_PART_INSTALL/usr/bin
+      mkdir -p $CRAFT_PART_INSTALL/usr/libexec
+      cp -r $CRAFT_PART_SRC $CRAFT_PART_INSTALL/usr/libexec/flutter
+      ln -s $CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter $CRAFT_PART_INSTALL/usr/bin/flutter
+      ln -s $SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart $SNAPCRAFT_PART_INSTALL/usr/bin/dart
+      $CRAFT_PART_INSTALL/usr/bin/flutter doctor
+    build-packages:
+      - clang
+      - cmake
+      - curl
+      - libgtk-3-dev
+      - ninja-build
+      - unzip
+      - xz-utils
+      - zip
+    override-prime: ''
+
   fluffychat:
-    plugin: flutter
+    after: [flutter-git]
+    plugin: nil
     source: .
     override-build: |
       # Workaround for Flutter build error:
       rm -rf build
-      craftctl default
+
+      flutter build linux --release -v
+      mkdir -p $CRAFT_PART_INSTALL/bin/
+      cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/
     build-packages:
       - libsecret-1-dev
       - libjsoncpp-dev
       - libssl-dev
       - curl
       - libpciaccess-dev
-      - cargo
-      - rustc
+    build-snaps:
+      - rustup
     stage-packages:
       - libsecret-1-0
       - libjsoncpp25
@@ -79,7 +106,7 @@ slots:
 
 apps:
   fluffychat:
-    command: fluffychat
+    command: bin/fluffychat
     extensions: [ gnome ]
     plugs:
       - audio-playback