diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 005d28f35..8bcd76dda 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -24,6 +24,9 @@ jobs:
     - name: Package install
       run: ./ci_prereq.sh
 
+    - name: Build Tools
+      run: ./ci_build_tools.sh
+
     - name: Build
       run: ./ci_build.sh
 
@@ -32,6 +35,9 @@ jobs:
 #
     - name: Make snapshot name
       id: snapshotname
+      if: github.repository == 'LoopZ/TheList' &&
+        github.ref_type != 'tag' &&
+        (github.event_name == 'push' || github.event.pull_request.merged == true)
       run: |
         (
           today=`date -u +%F | tr '\n' '-'`
@@ -40,9 +46,7 @@ jobs:
         )
 
     - name: Upload
-      if: github.repository == 'LoopZ/TheList' &&
-        github.ref_type != 'tag' &&
-        (github.event_name == 'push' || github.event.pull_request.merged == true)
+      if: steps.snapshotname.outputs.fname
       uses: actions/upload-artifact@v6
       with:
         name: ${{ steps.snapshotname.outputs.fname }}
diff --git a/ci_build.sh b/ci_build.sh
index 13970203a..d7f85ddd0 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -2,14 +2,6 @@
 
 set -e
 
-# Let's build makelist ourselves as we want to be sure that it's the latest
-(cd utilities
-  [ -f bin/makelist ] && mv bin/makelist bin/makelist.repo
-  fpc -obin/makelist makelist/makelist.lpr
-)
-
-echo
-
-# Now let's build the TheList
-./utilities/bin/makelist -s source -o TheList
+# Let's build the TheList
+./utilities/bin/makelist --cicd -s source -o TheList
 
diff --git a/ci_build_tools.sh b/ci_build_tools.sh
new file mode 100755
index 000000000..af0c885d4
--- /dev/null
+++ b/ci_build_tools.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# Let's build makelist ourselves as we want to be sure that it's the latest
+(cd utilities
+  [ -f bin/makelist ] && mv bin/makelist bin/makelist.repo
+  fpc -obin/makelist makelist/makelist.lpr
+)