diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ddc58c9b..6688d6f23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,6 +60,24 @@ linux-stable:
     - target/release/ethstore
     - target/release/ethkey
     name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
+    - snap
+    - beta
+  script:
+    - rm -rf *snap
+    - cd scripts
+    - snapcraft
+  tags:
+    - rust
+    - rust-stable
+  artifacts:
+    paths:
+    - scripts/parity_master_amd64.snap
+    name: "stable-x86_64-unknown-linux-gnu_parity-snap"
+  allow_failure: true
 linux-stable-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
@@ -348,7 +366,7 @@ linux-armv6:
   allow_failure: true
 linux-aarch64:
   stage: build
-  image: parity/rust-arm64:latest
+  image: parity/rust-arm64:gitlab-ci
   only:
     - beta
     - tags