diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4109ad8597..52b16d7cb78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ stages:
   - test
   - build
   - publish
-  - publish-onchain
   - optional
 
 image:                             parity/rust:gitlab-ci
@@ -14,6 +13,12 @@ variables:
   CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
 
+.no_git:                           &no_git
+  variables:
+    GIT_STRATEGY:                  none
+    GIT_SUBMODULE_STRATEGY:        none
+
+
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches
     - stable
@@ -94,6 +99,7 @@ build-windows:
 publish-docker:
   stage:                           publish
   only:                            *releaseable_branches
+  <<:                              *no_git
   cache: {}
   dependencies:
     - build-linux
@@ -103,11 +109,12 @@ publish-docker:
     - scripts/gitlab/publish-docker.sh parity
 
 publish-snap:
-  stage:                           optional #publish
+  stage:                           publish
   only:                            *releaseable_branches
+  # <<:                              *no_git
   image:                           snapcore/snapcraft
   variables:
-    BUILD_ARCH:                  amd64
+    BUILD_ARCH:                    amd64
   cache: {}
   before_script:                   *determine_version
   dependencies:
@@ -119,18 +126,17 @@ publish-snap:
   allow_failure:                   true
   <<:                              *collect_artifacts
 
-publish-onnet-update:
-  stage:                           publish-onchain
+publish-onchain:
+  stage:                           publish
   only:                            *releaseable_branches
+  <<:                              *no_git
   cache:                           {}
   dependencies:
     - build-linux
     - build-darwin
     - build-windows
-    - publish-awss3-release
-  before_script:                   *determine_version
   script:
-    - scripts/gitlab/publish-onnet-update.sh
+    - scripts/gitlab/publish-onchain.sh
   tags:
     - linux-docker
 
@@ -155,6 +161,7 @@ publish-awss3-release:
   image:                           parity/awscli:latest
   stage:                           publish
   only:                            *releaseable_branches
+  <<:                              *no_git
   cache:                           {}
   dependencies:
     - build-linux
diff --git a/scripts/gitlab/build-unix.sh b/scripts/gitlab/build-unix.sh
index 6244dc8460c..592bbd54e52 100755
--- a/scripts/gitlab/build-unix.sh
+++ b/scripts/gitlab/build-unix.sh
@@ -25,6 +25,7 @@ else
 fi
 
 echo "_____ Post-processing binaries _____"
+rm -rf artifacts/*
 mkdir -p artifacts/$CARGO_TARGET
 cd artifacts/$CARGO_TARGET
 
diff --git a/scripts/gitlab/publish-onnet-update.sh b/scripts/gitlab/publish-onchain.sh
similarity index 100%
rename from scripts/gitlab/publish-onnet-update.sh
rename to scripts/gitlab/publish-onchain.sh