diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 775f58a..3084903 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,21 +181,6 @@ pages:
       - public
   only:
     - main
-
-snap:amd64:
-  stage: coverage
-  image: ubuntu:20.04
-  except:
-    - coverage
-  script:
-    - apt-get update -qy
-    - apt-get install -y snapcraft
-    - snapcraft --debug
-  artifacts:
-    paths:
-      - './*.snap'
-    when: on_success
-    expire_in: 1 week
   
 snap:publish-candidate:
   stage: publish
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 269dba0..b70f3fa 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -16,10 +16,24 @@ apps:
     - home
 
 parts:
+  olm:
+    source: .
+    source-type: git
+    plugin: cmake
+    build-packages:
+    - build-essential
+    override-build: |
+      rm -r olm
+      git clone https://gitlab.matrix.org/matrix-org/olm.git
+      cd olm
+      cmake . -Bbuild
+      cmake --build build
+      sudo make install
   fluffychat:
     source: .
     plugin: flutter
     flutter-target: lib/main.dart
-  stage-packages:
+    stage-packages:
     - libsqlite3-0
-    - libolm3
+    override-build: sudo apt install libolm3
+    after: [olm]