diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93d07a4..e6e736d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ linux64_test:
     - mkdir -v -p $EXPORT_NAME$CI_COMMIT_SHORT_SHA
     - godot -v --export "Linux/X11" $EXPORT_NAME$CI_COMMIT_SHORT_SHA/$EXPORT_NAME$CI_COMMIT_SHORT_SHA.x86_64
   artifacts:
-    name: $EXPORT_NAME$CI_JOB_NAME$CI_COMMIT_SHORT_SHA
+    name: $EXPORT_NAME$CI_COMMIT_SHORT_SHA$CI_JOB_NAME
     paths:
       - $EXPORT_NAME$CI_COMMIT_SHORT_SHA
     expire_in: 1 week
@@ -29,12 +29,12 @@ linux64:
   tags:
     - Docker
   script:
-    - mkdir -v -p $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
-    - godot -v --export "Linux/X11" $EXPORT_NAME_$CI_COMMIT_SHORT_SHA/$EXPORT_NAME_$CI_COMMIT_SHORT_SHA.x86_64
+    - mkdir -v -p $EXPORT_NAME$CI_COMMIT_SHORT_SHA
+    - godot -v --export "Linux/X11" $EXPORT_NAME$CI_COMMIT_SHORT_SHA/$EXPORT_NAME$CI_COMMIT_SHORT_SHA.x86_64
   artifacts:
-    name: $EXPORT_NAME_$CI_JOB_NAME_$CI_COMMIT_SHORT_SHA
+    name: $EXPORT_NAME$CI_COMMIT_SHORT_SHA$CI_JOB_NAME
     paths:
-      - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
+      - $EXPORT_NAME$CI_COMMIT_SHORT_SHA
   only:
     - stable
 
@@ -43,12 +43,12 @@ windows:
   tags:
     - Docker
   script:
-    - mkdir -v -p $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
-    - godot -v --export "Windows Desktop" $EXPORT_NAME_$CI_COMMIT_SHORT_SHA/$EXPORT_NAME_$CI_COMMIT_SHORT_SHA.exe
+    - mkdir -v -p $EXPORT_NAME$CI_COMMIT_SHORT_SHA
+    - godot -v --export "Windows Desktop" $EXPORT_NAME$CI_COMMIT_SHORT_SHA/$EXPORT_NAME$CI_COMMIT_SHORT_SHA.exe
   artifacts:
-    name: $EXPORT_NAME_$CI_JOB_NAME_$CI_COMMIT_SHORT_SHA
+    name: $EXPORT_NAME$CI_COMMIT_SHORT_SHA$CI_JOB_NAME
     paths:
-      - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
+      - $EXPORT_NAME$CI_COMMIT_SHORT_SHA
   only:
     - stable
 
@@ -57,11 +57,11 @@ mac:
   tags:
     - Docker
   script:
-    - mkdir -v -p $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
-    - godot -v --export "Mac OSX" $EXPORT_NAME_$CI_COMMIT_SHORT_SHA/$EXPORT_NAME_$CI_COMMIT_SHORT_SHA.zip
+    - mkdir -v -p $EXPORT_NAME$CI_COMMIT_SHORT_SHA
+    - godot -v --export "Mac OSX" $EXPORT_NAME$CI_COMMIT_SHORT_SHA/$EXPORT_NAME$CI_COMMIT_SHORT_SHA.zip
   artifacts:
-    name: $EXPORT_NAME_$CI_JOB_NAME_$CI_COMMIT_SHORT_SHA
+    name: $EXPORT_NAME$CI_COMMIT_SHORT_SHA$CI_JOB_NAME
     paths:
-      - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
+      - $EXPORT_NAME$CI_COMMIT_SHORT_SHA
   only:
     - stable