diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index f4fbae8..184c5c8 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CI/CD Pipeline
+name: Generate Skin previews, OSK files and per skin documentation
 
 on:
   push:
@@ -42,7 +42,7 @@ env:
 jobs:
   generate_everything:
     name: Full CI/CD Pipeline
-    runs-on: ubuntu-latest
+    runs-on: danser
     container:
       image: ${{ vars.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       options: >-
@@ -172,7 +172,6 @@ jobs:
           echo ""
           echo "[Detect Changed Skin Directories Complete — ${#uniq_skins[@]} skins processed, ${#deleted_skins[@]} skins deleted]"
 
-
       - name: Pull Git LFS objects for changed skins (and core assets)
         shell: bash
         run: |
@@ -494,15 +493,22 @@ jobs:
             for group_list in "$group1_icons" "$group2_icons" "$group3_icons"; do
               montage_files=()
               for icon in $group_list; do
+                file=""
                 if [ -f "${ICON_FOLDER}/selection-mod-${icon}@2x.png" ]; then
-                  montage_files+=("${ICON_FOLDER}/selection-mod-${icon}@2x.png")
+                  file="${ICON_FOLDER}/selection-mod-${icon}@2x.png"
+                elif [ -f "${ICON_FOLDER}/selection-mod-${icon}.png" ]; then
+                  file="${ICON_FOLDER}/selection-mod-${icon}.png"
                 elif [ -f "${DEFAULT_SKIN_DIR}/selection-mod-${icon}@2x.png" ]; then
-                  montage_files+=("${DEFAULT_SKIN_DIR}/selection-mod-${icon}@2x.png")
+                  file="${DEFAULT_SKIN_DIR}/selection-mod-${icon}@2x.png"
                 fi
+
+                [ -n "$file" ] && montage_files+=("$file")
               done
+
               while [ "${#montage_files[@]}" -lt 7 ]; do
                 montage_files+=("$BLANK_IMAGE")
               done
+
               magick montage "${montage_files[@]}" \
                 -tile "7x1" -geometry "160x160+10+10" -background none \
                 "row_${row_index}.png"
@@ -861,6 +867,7 @@ jobs:
           echo "[Cleanup Extra Files Started]"
 
           [ -f how-to-use.md ] && rm -f how-to-use.md
+          [ -f src/replay.osr ] && rm -f src/replay.osr
 
           readarray -t skins <<< "$ALL_SKINS_DIR"