diff --git a/.github/workflows/scripts/windows-in-container-build.sh b/.github/workflows/scripts/windows-in-container-build.sh
index 200dea06b..5cec6a2ee 100644
--- a/.github/workflows/scripts/windows-in-container-build.sh
+++ b/.github/workflows/scripts/windows-in-container-build.sh
@@ -20,11 +20,13 @@ bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
 # the strange two step move is in order to get predictable names to use
 # in the publish step of the GitHub Action
 mv subsurface/subsurface.exe* ${GITHUB_WORKSPACE}/
-mv subsurface/subsurface-*.exe ${GITHUB_WORKSPACE}/subsurface-installer.exe
+fullname=$(cd subsurface ; ls subsurface-*.exe)
+mv subsurface/"$fullname" ${GITHUB_WORKSPACE}/"${fullname%.exe}-installer.exe"
 
 bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i
 
 # the strange two step move is in order to get predictable names to use
 # in the publish step of the GitHub Action
 mv smtk-import/smtk2ssrf.exe ${GITHUB_WORKSPACE}/
-mv smtk-import/smtk2ssrf*.exe ${GITHUB_WORKSPACE}/smtk2ssrf-installer.exe
+fullname=$(cd smtk-import ; ls smtk2ssrf*.exe)
+mv smtk-import/smtk2ssrf*.exe ${GITHUB_WORKSPACE}/"${fullname%.exe}-installer.exe"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 88faa32f2..d52c038d2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -23,12 +23,18 @@ jobs:
       run: |
         export tag=""
         export is_latest=false
-        if [ "${{ github.ref_type }}" = "tag" ] ; then tag="${{ github.ref_name }}" ; else tag="latest"; is_latest=true ; fi
+        if [ "${{ github.ref_type }}" = "tag" ]
+        then
+          tag="${{ github.ref_name }}"
+        else
+          tag="latest"
+          is_latest=true
+        fi
         echo "tag=${tag}" >> $GITHUB_OUTPUT
         echo "is_latest=${is_latest}" >> $GITHUB_OUTPUT
 
     - name: tag current version as latest if we don't have a tag
-      if: ${{ steps.tag.outputs.is_latest == true }}
+      if: ${{ steps.tag.outputs.is_latest == 'true' }}
       uses: rickstaa/action-create-tag@v1
       with:
         tag: "latest"