diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e35d12620..348c7509c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,6 +179,18 @@ build_linux_arm64:
     paths:
       - build/linux/arm64/release/bundle/
 
+deploy_linux_snap_edge:
+  image: cibuilds/snapcraft:core18
+  stage: deploy
+  script: [./scripts/publish-snap-edge.sh]
+  only:
+    - main
+  needs: [build_linux_x86]
+  artifacts:
+    when: on_success
+    paths:
+      - ./*.snap
+
 update-dependencies:
   stage: coverage
   needs: []
diff --git a/scripts/publish-snap-edge.sh b/scripts/publish-snap-edge.sh
index 08d7c479d..916bd75fe 100755
--- a/scripts/publish-snap-edge.sh
+++ b/scripts/publish-snap-edge.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -ve
 echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > snapcraft.login
 snapcraft login --with snapcraft.login
-snapcraft
+snapcraft remote-build --launchpad-accept-public-upload --status --launchpad-user krillechritzel
 snapcraft upload --release=edge *.snap
 snapcraft logout
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9554465ac..77603cb8d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -23,6 +23,9 @@ description: |
 grade: stable
 confinement: strict
 
+architectures:
+  - build-on: amd64
+
 parts:
   olm:
     plugin: cmake