diff --git a/tools/jenkins/build-Linux-installer.sh b/tools/jenkins/build-Linux-installer.sh
index 7380b12cd5..3fc7c21bcd 100755
--- a/tools/jenkins/build-Linux-installer.sh
+++ b/tools/jenkins/build-Linux-installer.sh
@@ -654,10 +654,15 @@ rm "${TMP_PORTABLE_DIR}/bin/Tests"
 # Build repo and packages
 
 ONLINE_INSTALL_DIR="online_installer"
-BUNDLED_INSTALL_DIR="offline_installer"
-ZIP_INSTALL_DIR="compressed_no_installer"
-DEB_INSTALL_DIR="deb_package"
-RPM_INSTALL_DIR="rpm_package"
+#BUNDLED_INSTALL_DIR="offline_installer"
+#ZIP_INSTALL_DIR="compressed_no_installer"
+#DEB_INSTALL_DIR="deb_package"
+#RPM_INSTALL_DIR="rpm_package"
+# These have easily identifiable filenames and extensions anyway:
+BUNDLED_INSTALL_DIR="."
+ZIP_INSTALL_DIR="."
+DEB_INSTALL_DIR="."
+RPM_INSTALL_DIR="."
 
 if [ -d "${BUILD_ARCHIVE_DIRECTORY}" ]; then
     rm -rf "${BUILD_ARCHIVE_DIRECTORY}"
diff --git a/tools/jenkins/build-OSX-installer.sh b/tools/jenkins/build-OSX-installer.sh
index 46de9ee8cc..da103cc16d 100755
--- a/tools/jenkins/build-OSX-installer.sh
+++ b/tools/jenkins/build-OSX-installer.sh
@@ -933,17 +933,8 @@ rm "${PORTABLE_DIRNAME}.app/Contents/MacOS/Tests"
 echo "* Creating the disk image"
 # Make the dmg
 APP_NAME=Natron
-DMG_FINAL="${APP_NAME}"
-if [ "$NATRON_BUILD_CONFIG" = "SNAPSHOT" ]; then
-    DMG_FINAL="${DMG_FINAL}-${NATRON_GIT_BRANCH}-${CURRENT_DATE}"
-fi
-
-DMG_FINAL="${DMG_FINAL}-${NATRON_VERSION_STRING}-${PKGOS}-${BITS}"
-if [ "$COMPILE_TYPE" = "debug" ]; then
-    DMG_FINAL="${DMG_FINAL}-debug"
-fi
 
-DMG_FINAL="${DMG_FINAL}.dmg"
+DMG_FINAL="${INSTALLER_BASENAME}.dmg"
 DMG_TMP="tmp${DMG_FINAL}"
 
 
@@ -1059,8 +1050,8 @@ rm -rf splashscreen.*
 if [ -d "${BUILD_ARCHIVE_DIRECTORY}" ]; then
     rm -rf "${BUILD_ARCHIVE_DIRECTORY}"
 fi
-mkdir -p "${BUILD_ARCHIVE_DIRECTORY}/compressed_no_installer"
-mv "${DMG_FINAL}" "${BUILD_ARCHIVE_DIRECTORY}/compressed_no_installer/"
+mkdir -p "${BUILD_ARCHIVE_DIRECTORY}"
+mv "${DMG_FINAL}" "${BUILD_ARCHIVE_DIRECTORY}/"
 
 echo "*** Artifacts:"
 ls -R  "${BUILD_ARCHIVE_DIRECTORY}"
diff --git a/tools/jenkins/build-Windows-installer.sh b/tools/jenkins/build-Windows-installer.sh
index 60791793b0..ceb02ad6a4 100755
--- a/tools/jenkins/build-Windows-installer.sh
+++ b/tools/jenkins/build-Windows-installer.sh
@@ -500,8 +500,12 @@ echo "Done"
 # Create installers
 
 ONLINE_INSTALL_DIR="online_installer"
-BUNDLED_INSTALL_DIR="offline_installer"
-ZIP_INSTALL_DIR="compressed_no_installer"
+#BUNDLED_INSTALL_DIR="offline_installer"
+#ZIP_INSTALL_DIR="compressed_no_installer"
+
+# These have easily identifiable filenames and extensions anyway:
+BUNDLED_INSTALL_DIR="."
+ZIP_INSTALL_DIR="."
 
 mkdir -p "${BUILD_ARCHIVE_DIRECTORY}/$BUNDLED_INSTALL_DIR"
 
diff --git a/tools/jenkins/launchBuildMain.sh b/tools/jenkins/launchBuildMain.sh
index 7640a591f5..5a02afdd9e 100755
--- a/tools/jenkins/launchBuildMain.sh
+++ b/tools/jenkins/launchBuildMain.sh
@@ -515,7 +515,47 @@ if [ "$NATRON_BUILD_CONFIG" = "SNAPSHOT" ]; then
     INSTALLER_BASENAME="${INSTALLER_BASENAME}-${NATRON_GIT_BRANCH}-${CURRENT_DATE}"
 fi
 
-INSTALLER_BASENAME="${INSTALLER_BASENAME}-${NATRON_VERSION_STRING}-${PKGOS}-${BITS}"
+INSTALLER_OS="${PKGOS}"
+INSTALLER_ARCH="${BITS}"
+if [ "${INSTALLER_OS}" = "OSX" ]; then
+    case "$(sw_vers -productVersion)" in
+        10.5.*) INSTALLER_OS="MacOSX105";; 
+        10.6.*) INSTALLER_OS="MacOSX106";; 
+        10.7.*) INSTALLER_OS="MacOSX107";; 
+        10.8.*) INSTALLER_OS="OSX108";; 
+        10.9.*) INSTALLER_OS="OSX109";; 
+        10.10.*) INSTALLER_OS="OSX1010";; 
+        10.11.*) INSTALLER_OS="OSX1011";; 
+        10.12.*) INSTALLER_OS="macOS1012";; 
+        10.13.*) INSTALLER_OS="macOS1013";; 
+        10.14.*) INSTALLER_OS="macOS1014";; 
+        10.15.*) INSTALLER_OS="macOS1015";; 
+        11.*) INSTALLER_OS="macOS11";; 
+        12.*) INSTALLER_OS="macOS12";; 
+        13.*) INSTALLER_OS="macOS13";; 
+        14.*) INSTALLER_OS="macOS14";; 
+    esac
+
+    case "${BITS}" in
+        32) INSTALLER_ARCH="$(uname -p)";; 
+        64) INSTALLER_ARCH="$(uname -m)";;
+        Universal) INSTALLER_ARCH="Universal-i386-x86_64";;  # TODO: support Universal-x86_64-arm64
+    esac
+fi
+
+if [ "${INSTALLER_OS}" = "Linux" ] || [ "${INSTALLER_OS}" = "FreeBSD" ]; then
+    # Target is always the build arch
+    INSTALLER_ARCH="$(uname -m)"
+fi
+
+if [ "${INSTALLER_OS}" = "Windows" ]; then
+    case "${BITS}" in
+        32) INSTALLER_ARCH="i386";; 
+        64) INSTALLER_ARCH="x86_64";;
+    esac
+fi
+
+INSTALLER_BASENAME="${INSTALLER_BASENAME}-${NATRON_VERSION_STRING}-${INSTALLER_OS}-${INSTALLER_ARCH}"
 
 if [ "$COMPILE_TYPE" = "debug" ]; then
     INSTALLER_BASENAME="${INSTALLER_BASENAME}-debug"
diff --git a/tools/jenkins/runUnitTests.sh b/tools/jenkins/runUnitTests.sh
index bed36f99e3..8989f1da61 100755
--- a/tools/jenkins/runUnitTests.sh
+++ b/tools/jenkins/runUnitTests.sh
@@ -158,7 +158,7 @@ if [ "$FAIL" = "0" ]; then
         mv result.txt "$BUILD_ARCHIVE_DIRECTORY/${INSTALLER_BASENAME}-tests.txt"
     fi
 
-    UNIT_TESTS_FAIL_DIR="$BUILD_ARCHIVE_DIRECTORY/unit_tests_failures"
+    UNIT_TESTS_FAIL_DIR="$BUILD_ARCHIVE_DIRECTORY/${INSTALLER_BASENAME}-unit_tests_failures"
     if [ -n "${UNIT_TESTS_FAIL_DIR:-}" ] && [ -d "failed" ] && [ "$(ls -A failed)" ]; then
         printStatusMessage "Moving test failures to $UNIT_TESTS_FAIL_DIR"
         mkdir -p "$UNIT_TESTS_FAIL_DIR"