diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfd71bc..01d4450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,20 @@ image: archlinux/archlinux:base-devel
 variables:
   Desktop: "cosmic"
 
-archiso:
+build_iso:
   stage: build
   script:
     - ./build.sh
     - echo "Renaming the output ISO file"
-    - mv out/*.iso out/Parchlinux-$Desktop-latest.iso
+    - mv out/*.iso out/ParchLinux-cosmic-latest.iso
+  artifacts:
+    paths:
+      - out/ParchLinux-cosmic-latest.iso
+
+deploy_iso:
   stage: deploy
+  dependencies:
+    - build_iso
   script:
     - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
@@ -22,8 +29,6 @@ archiso:
     - echo "Creating new directory on remote host"
     - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/cosmic/
     - echo "Uploading new ISO via rsync"
-    - sshpass -p "$PASS" rsync -r "$(ls out/*.iso)" parch@SSH_ROOT:/srv/http/cosmic/
+    - sshpass -p "$PASS" rsync -r out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
   rules:
-    - if: $CI_COMMIT_TAG  
-
-
+    - if: $CI_COMMIT_TAG