diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef890d27..0197f630 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,17 @@ test:
   stage: coverage
   script: [flutter test]
 
+snapcraft:
+  stage: release
+  image: ubuntu:18.04
+  before_script: [sudo apt update && sudo apt install snapcraft -y]
+  script:
+    - snapcraft login --with $SNAPCRAFT_LOGIN_DATA
+    - snapcraft remote-build --status --launchpad-accept-public-upload
+    - snapcraft upload *.snap --release edge
+  #only:
+  #  - main
+
 build_web:
   stage: coverage
   before_script:
diff --git a/snap/gui/fluffychat.desktop b/snap/gui/fluffychat.desktop
new file mode 100755
index 00000000..88614875
--- /dev/null
+++ b/snap/gui/fluffychat.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=FluffyChat
+GenericName=Matrix Client
+Comment=Chat with your friends
+Exec=fluffychat
+Icon=${SNAP}/meta/gui/fluffychat.png
+Terminal=false
+Type=Application
+Categories=Network;Chat;InstantMessaging;
diff --git a/snap/gui/fluffychat.png b/snap/gui/fluffychat.png
new file mode 100644
index 00000000..e0076493
Binary files /dev/null and b/snap/gui/fluffychat.png differ
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 00000000..ce58c069
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,94 @@
+name: fluffychat
+base: core18
+adopt-info: fluffychat
+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.
+
+
+  ## Features
+
+  - Send all kinds of messages, images and files
+  - Voice messages
+  - Location sharing
+  - Push notifications
+  - Unlimited private and public group chats
+  - Public channels with thousands of participants
+  - Feature rich group moderation including all matrix features
+  - Discover and join public groups
+  - Dark mode
+  - Hides complexity of Matrix IDs behind simple QR codes
+  - Custom emotes and stickers
+  - Video calls via sharing links to Jitsi
+  - Spaces
+  - Compatible with Element, Nheko, NeoChat and all other Matrix apps
+  - End to end encryption
+  - Emoji verification & cross signing
+  - And much more...
+
+
+  ## FluffyChat comes with a dream
+
+  Imagine a world where everyone can choose the messenger they like and is still able to chat with all of their friends.
+
+  A world where there are no companies spying on you when you send selfies to friends and lovers.
+
+  And a world where apps are made for fluffyness and not for profit. ♥
+
+  Join the community: https://matrix.to/#/#fluffychat:matrix.org
+  Website: http://fluffychat.im
+  Microblog: https://metalhead.club/@krille
+
+grade: stable
+confinement: strict
+
+architectures:
+  - build-on: amd64
+  - build-on: arm64
+
+parts:
+  olm:
+    plugin: cmake
+    source: https://gitlab.matrix.org/matrix-org/olm.git
+    source-type: git
+    source-tag: 3.2.9
+    build-packages:
+      - g++
+  fluffychat:
+    plugin: flutter
+    source: https://gitlab.com/famedly/fluffychat.git
+    flutter-target: lib/main.dart
+    # Must be after: flutter-extension to set the flutter channel; flutter-extension will set it to “dev”, which is unhelpful
+    after:
+      - flutter-extension
+    override-build: |
+      snapcraftctl set-version $(git describe --always --tag)
+      snapcraftctl build
+    override-pull: |
+      snapcraftctl pull
+      flutter channel stable
+      flutter upgrade
+    build-packages:
+      - libjsoncpp-dev
+      - libsecret-1-dev
+    stage-packages:
+      - libsecret-1-dev
+      - libjsoncpp-dev
+      
+slots:
+  dbus-svc:
+    interface: dbus
+    bus: session
+    name: chat.fluffy.fluffychat
+
+apps:
+  fluffychat:
+    extensions:
+      - flutter-dev
+    command: fluffychat
+    plugs:
+      - network
+      - home
+    slots:
+      - dbus-svc
+