diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml
index 69f1b71b0..1a817f006 100644
--- a/.github/workflows/main_deploy.yaml
+++ b/.github/workflows/main_deploy.yaml
@@ -80,26 +80,3 @@ jobs:
           bundle update fastlane
           bundle exec fastlane deploy_internal_test
           cd ..
-
-  deploy_snapcraft:
-    strategy:
-      matrix:
-        arch: [ x64, arm64 ]
-    runs-on: ${{ matrix.arch == 'arm64' && 'self-hosted' || 'ubuntu-latest'}}
-    steps:
-      - uses: actions/checkout@v4
-      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install git wget curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev libwebkit2gtk-4.1-dev -y
-      - name: Install Flutter
-        run: |
-          git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git
-          ./flutter/bin/flutter doctor
-      - run: ./flutter/bin/flutter pub get
-      - run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }} --release
-      - run: mv ./build/linux/${{ matrix.arch }}/release ./build/linux/
-      - uses: snapcore/action-build@v1
-        id: build
-      - uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
\ No newline at end of file
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0eb4305bc..a670a2a72 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -3,10 +3,6 @@ title: FluffyChat
 base: core24
 version: git
 license: AGPL-3.0
-website: https://fluffychat.im
-source-code: https://github.com/krille-chan/fluffychat
-issues: https://github.com/krille-chan/fluffychat/issues
-donation: https://ko-fi.com/krille
 summary: The cutest messenger in the Matrix network
 description: |
   FluffyChat is an open source, nonprofit and cute matrix messenger app. The app is easy to use but secure and decentralized.
@@ -71,14 +67,20 @@ parts:
       - zenity-integration
 
   fluffychat:
-    plugin: dump
-    source: ./build/linux/release
-    source-type: local
+    plugin: flutter
+    source: .
+    override-build: |
+      # Workaround for Flutter build error:
+      rm -rf build
+      craftctl default
+    build-packages:
+      - libjsoncpp-dev
+      - curl
     stage-packages:
       - libsecret-1-dev
       - libjsoncpp-dev
       - libssl-dev
-      - libwebkit2gtk-4.1-dev
+      #- libwebkit2gtk-4.1-dev
 
 slots:
   dbus-svc: