diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f98ae314..cea6d49cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
   - test
   - build
   - publish
-  - docs
+  - misc
 
 image:                             parity/rust:gitlab-ci
 
@@ -24,7 +24,6 @@ cache:
     - stable
     - beta
     - tags
-    - a5-gitlab-light ### @TODO remove
 
 .collect_artifacts:                &collect_artifacts
   artifacts:
@@ -42,8 +41,6 @@ cache:
   - export VERSION
   - echo "Version = ${VERSION}"
 
-#### stage:                        test
-
 test-linux:
   stage:                           test
   variables:
@@ -63,7 +60,7 @@ test-darwin:
   script:
     - scripts/gitlab/test.sh stable
   tags:
-    - osx
+    - rust-osx
 
 test-windows:
   stage:                           test
@@ -80,8 +77,6 @@ test-windows:
   tags:
    - rust-windows
 
-#### stage:                        build
-
 build-linux:
   stage:                           build
   only:                            *releaseable_branches
@@ -103,7 +98,7 @@ build-darwin:
   script:
     - scripts/gitlab/build-unix.sh
   tags:
-    - osx
+    - rust-osx
   <<:                              *collect_artifacts
 
 build-windows:
@@ -122,8 +117,6 @@ build-windows:
    - rust-windows
   <<:                              *collect_artifacts
 
-#### stage:                        publish
-
 publish-docker:
   stage:                           publish
   only:                            *releaseable_branches
@@ -140,7 +133,6 @@ publish-awss3:
   only:
     - nightly
     - /^v2.*$/
-    - a5-gitlab-light ### @TODO remove
   cache: {}
   dependencies:
     - build-linux
@@ -152,13 +144,40 @@ publish-awss3:
   tags:
     - shell
 
-docs-jsonrpc:
-  stage: docs
+misc-docs:
+  stage:                            misc
   only:
     - tags
-    - a5-gitlab-light ### @TODO remove
   cache: {}
   script:
     - scripts/gitlab/docs-jsonrpc.sh
   tags:
     - shell
+
+misc-android:
+  stage:                           misc
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/test.sh stable
+  tags:
+    - rust-arm
+
+misc-beta:
+  stage:                           misc
+  variables:
+    RUN_TESTS:                     "true"
+  script:
+    - scripts/gitlab/test.sh beta
+  tags:
+    - rust-beta
+
+misc-nightly:
+  stage:                           misc
+  variables:
+    RUN_TESTS:                     "true"
+  script:
+    - scripts/gitlab/test.sh nightly
+  tags:
+    - rust-nightly