diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ba1bfa..2d25c61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,10 +12,17 @@ build_iso:
   script:
     - ./build.sh
     - echo "Renaming the output ISO file"
-    - mv out/*.iso out/ParchLinux-cosmic-latest.iso
+    - mv out/*.iso out/ParchLinux-$Desktop-latest.iso
+    - echo "Generating MD5 checksum"
+    - md5sum out/ParchLinux-$Desktop-latest.iso > out/md5sum.txt
+    - BUILD_DATE=$(date +"%Y-%m-%d")
+    - echo "Build Date: $BUILD_DATE" >> out/md5sum.txt
+    - echo "Build completed. Files generated:"
+    - ls -lh out/
   artifacts:
     paths:
-      - out/ParchLinux-cosmic-latest.iso
+      - out/ParchLinux-$Desktop-latest.iso
+      - out/md5sum.txt
   rules:
     - if: $CI_COMMIT_TAG
 
@@ -26,11 +33,17 @@ deploy_iso:
   script:
     - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
+
+    - echo "Determining the remote directory based on the tag"
+    - if [[ "$CI_COMMIT_TAG" == *"beta"* ]]; then export REMOTE_DIR="/srv/http/beta/$Desktop/"; else export REMOTE_DIR="/srv/http/$Desktop"; fi
+
     - echo "Removing old ISO files from remote directory"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf /srv/http/cosmic/
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf $REMOTE_DIR/
+
     - echo "Creating new directory on remote host"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/cosmic/
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p $REMOTE_DIR/
+
     - echo "Uploading new ISO via rsync"
-    - sshpass -p "$PASS" rsync -r out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
+    - sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso out/md5sum.txt parch@$SSH_ROOT:$REMOTE_DIR/
   rules:
     - if: $CI_COMMIT_TAG