diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c7969e7bf2aab55a77495dbe128803cbe650988..75d28654c5d5d4971be6ae210583af2326e49055 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,13 @@
 stages:
-    - quality
-    - tests
-    - install
-    - upload
+    - code-quality
+    - make-test
+    - make-install
+    - sources-upload
 
 
 
 code-quality:
-    stage: quality
+    stage: code-quality
     script:
         - export DEBIAN_FRONTEND=noninteractive
         - apt-get update
@@ -18,7 +18,7 @@ code-quality:
 
 
 make-test:
-    stage: tests
+    stage: make-test
     script:
         - export DEBIAN_FRONTEND=noninteractive
         - apt-get update
@@ -32,7 +32,7 @@ make-test:
 
 
 make-install:
-    stage: install
+    stage: make-install
     script:
         - export DEBIAN_FRONTEND=noninteractive
         - apt-get update
@@ -45,8 +45,8 @@ make-install:
 
 
 
-upload-tagged:
-    stage: upload
+sources-upload:
+    stage: sources-upload
     only:
         - tags@allworldit/awit-ssh-client
     except:
@@ -60,7 +60,7 @@ upload-tagged:
         # Import signing key
         - echo "$GPG_SIGNKEY" | gpg --import
         # Work out naming
-        - ARCHIVE_NAME=${CI_PROJECT_NAME}-${CI_BUILD_TAG##v}
+        - export ARCHIVE_NAME=${CI_PROJECT_NAME}-${CI_BUILD_TAG##v}
         # Create tar archive
         - git archive --format=tar --prefix=${ARCHIVE_NAME}/ ${CI_BUILD_TAG} > ../${ARCHIVE_NAME}.tar
         # Create compressed versions