diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0002753bb..ebdc9501f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,13 +21,15 @@ linux-stable:
     - export
     - cargo build --release --verbose
     - strip target/release/parity
+    - mkdir -p x86_64-unknown-linux-gnu/stable
+    - cp target/release/parity x86_64-unknown-linux-gnu/stable/parity
   tags:
     - rust
     - rust-stable
   artifacts:
     paths:
-    - target/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - x86_64-unknown-linux-gnu/stable/parity
+    name: "stable-x86_64-unknown-linux-gnu_parity"
 linux-beta:
   stage: build
   image: ethcore/rust:beta
@@ -40,14 +42,15 @@ linux-beta:
     - export
     - cargo build --release --verbose
     - strip target/release/parity
-    - cp target/release/parity parity
+    - mkdir -p x86_64-unknown-linux-gnu/beta
+    - cp target/release/parity x86_64-unknown-linux-gnu/beta/parity
   tags:
     - rust
     - rust-beta
   artifacts:
     paths:
-    - target/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - x86_64-unknown-linux-gnu/beta/parity
+    name: "beta-x86_64-unknown-linux-gnu_parity"
 linux-nightly:
   stage: build
   image: ethcore/rust:nightly
@@ -59,13 +62,15 @@ linux-nightly:
   script:
     - cargo build --release --verbose
     - strip target/release/parity
+    - mkdir -p x86_64-unknown-linux-gnu/nightly
+    - cp target/release/parity x86_64-unknown-linux-gnu/nigthly/parity
   tags:
     - rust
     - rust-nightly
   artifacts:
     paths:
-    - target/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - x86_64-unknown-linux-gnu/nigthly/parity
+    name: "nigthly-x86_64-unknown-linux-gnu_parity"
   allow_failure: true
 linux-centos:
   stage: build
@@ -80,13 +85,15 @@ linux-centos:
     - export CC="gcc"
     - cargo build --release --verbose
     - strip target/release/parity
+    - mkdir -p x86_64-unknown-linux-gnu/centos
+    - cp target/release/parity x86_64-unknown-linux-gnu/centos/parity
   tags:
     - rust
     - rust-centos
   artifacts:
     paths:
-    - target/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - x86_64-unknown-linux-gnu/centos/parity
+    name: "centos-x86_64-unknown-linux-gnu_parity"
 linux-armv7:
   stage: build
   image: ethcore/rust-arm:latest
@@ -104,13 +111,15 @@ linux-armv7:
     - cat .cargo/config
     - cargo build --target armv7-unknown-linux-gnueabihf --release --verbose
     - arm-linux-gnueabihf-strip target/armv7-unknown-linux-gnueabihf/release/parity
+    - mkdir -p armv7_unknown_linux_gnueabihf
+    - cp target/release/party armv7_unknown_linux_gnueabihf/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/armv7-unknown-linux-gnueabihf/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - armv7-unknown-linux-gnueabihf/parity
+    name: "armv7_unknown_linux_gnueabihf_parity"
   allow_failure: true
 linux-arm:
   stage: build
@@ -122,20 +131,22 @@ linux-arm:
     - stable
   script:
     - export
-    #- rm -rf .cargo
-    #- mkdir -p .cargo
-    #- echo "[target.arm-unknown-linux-gnueabihf]" >> .cargo/config
-    #- echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    #- cat .cargo/config
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.arm-unknown-linux-gnueabihf]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
+    - cat .cargo/config
     - cargo build --target arm-unknown-linux-gnueabihf --release --verbose
     - arm-linux-gnueabihf-strip target/arm-unknown-linux-gnueabihf/release/parity
+    - mkdir -p arm-unknown-linux-gnueabihf
+    - cp target/release/parity arm-unknown-linux-gnueabihf/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/arm-unknown-linux-gnueabihf/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - arm-unknown-linux-gnueabihf/parity
+    name: "arm-unknown-linux-gnueabihf_parity"
   allow_failure: true
 linux-armv6:
   stage: build
@@ -147,20 +158,22 @@ linux-armv6:
     - stable
   script:
     - export
-    #- rm -rf .cargo
-    #- mkdir -p .cargo
-    #- echo "[target.arm-unknown-linux-gnueabi]" >> .cargo/config
-    #- echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
-    #- cat .cargo/config
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.arm-unknown-linux-gnueabi]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
+    - cat .cargo/config
     - cargo build --target arm-unknown-linux-gnueabi --release --verbose
     - arm-linux-gnueabi-strip target/arm-unknown-linux-gnueabi/release/parity
+    - mkdir -p arm-unknown-linux-gnueabi
+    - cp target/release/parity arm-unknown-linux-gnueabi/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/arm-unknown-linux-gnueabi/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - arm-unknown-linux-gnueabi/parity
+    name: "arm-unknown-linux-gnueabi_parity"
   allow_failure: true
 linux-aarch64:
   stage: build
@@ -172,20 +185,22 @@ linux-aarch64:
     - stable
   script:
     - export
-    #- rm -rf .cargo
-    #- mkdir -p .cargo
-    #- echo "[target.aarch64-unknown-linux-gnu]" >> .cargo/config
-    #- echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
-    #- cat .cargo/config
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.aarch64-unknown-linux-gnu]" >> .cargo/config
+    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
+    - cat .cargo/config
     - cargo build --target aarch64-unknown-linux-gnu --release --verbose
     - aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/parity
+    - mkdir -p aarch64-unknown-linux-gnu
+    - cp target/release/parity aarch64-unknown-linux-gnu/parity
   tags:
     - rust
     - rust-arm
   artifacts:
     paths:
-    - target/aarch64-unknown-linux-gnu/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - aarch64-unknown-linux-gnu/parity
+    name: "aarch64-unknown-linux-gnu_parity"
   allow_failure: true
 darwin:
   stage: build
@@ -196,12 +211,14 @@ darwin:
     - stable
   script:
     - cargo build --release --verbose
+    - mkdir -p x86_64-apple-darwin
+    - cp target/release/parity x86_64-apple-darwin/parity
   tags:
     - osx
   artifacts:
     paths:
-    - target/release/parity
-    name: "${CI_BUILD_NAME}_parity"
+    - x86_64-apple-darwin/parity
+    name: "x86_64-apple-darwin_parity"
 windows:
   stage: build
   only:
@@ -221,7 +238,7 @@ windows:
     paths:
     - target/release/parity.exe
     - target/release/parity.pdb
-    name: "${CI_BUILD_NAME}_parity"
+    name: "x86_64-pc-windows-msvc_parity"
 test-linux:
   stage: test
   before_script: