diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dec48748..a2f0db20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,7 +170,8 @@ build_linux:
 
 snap:edge:
   stage: release
-  before_script: [sudo apt update && sudo apt install snapcraft -y]
+  image: "snapcore/snapcraft"
+  before_script: []
   variables:
     SNAPCRAFT_LOGIN_FILE: ${SNAPCRAFT_LOGIN_FILE}
   only:
@@ -185,7 +186,7 @@ snap:edge:
 
 snap:publish:
   stage: release
-  before_script: [sudo apt update && sudo apt install snapcraft -y]
+  image: "snapcore/snapcraft"
   variables:
     SNAPCRAFT_LOGIN_FILE: ${SNAPCRAFT_LOGIN_FILE}
   only:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7ec0a528..f49a26c4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -35,6 +35,7 @@ parts:
   fluffychat:
     plugin: dump
     source: ./build/linux/release/bundle/
+    build-snaps: [flutter]
     stage-packages:
       - libsqlite3-dev
       #- libolm-dev # Not available in core18