diff --git a/makefiles/Makefile.archive.mk b/makefiles/Makefile.archive.mk
index bf4f156ba7..3b8519e533 100644
--- a/makefiles/Makefile.archive.mk
+++ b/makefiles/Makefile.archive.mk
@@ -17,6 +17,14 @@ endif
 ################
 .PHONY: clean_archive # Clean Archive output from previous build.
 clean_archive:
+	-$(DELREC) $(INSTALL_CPP_NAME)
+	-$(DELREC) $(INSTALL_CPP_NAME)$(ARCHIVE_EXT)
+	-$(DELREC) $(INSTALL_DOTNET_NAME)
+	-$(DELREC) $(INSTALL_DOTNET_NAME)$(ARCHIVE_EXT)
+	-$(DELREC) $(INSTALL_JAVA_NAME)
+	-$(DELREC) $(INSTALL_JAVA_NAME)$(ARCHIVE_EXT)
+	-$(DELREC) $(INSTALL_PYTHON_NAME)
+	-$(DELREC) $(INSTALL_PYTHON_NAME)$(ARCHIVE_EXT)
 
 #############
 ##  DEBUG  ##
diff --git a/makefiles/Makefile.port.mk b/makefiles/Makefile.port.mk
index bdf24e04e0..dac0d46f96 100644
--- a/makefiles/Makefile.port.mk
+++ b/makefiles/Makefile.port.mk
@@ -297,7 +297,7 @@ endif
 INSTALL_CPP_NAME := or-tools_cpp_$(PORT)_v$(OR_TOOLS_VERSION)
 INSTALL_DOTNET_NAME := or-tools_dotnet_$(PORT)_v$(OR_TOOLS_VERSION)
 INSTALL_JAVA_NAME := or-tools_java_$(PORT)_v$(OR_TOOLS_VERSION)
-INSTALL_PYTHON_NAME := or-tools_python_$(PORT)_v$(OR_TOOLS_VERSION)
+INSTALL_PYTHON_NAME := or-tools_python$(PYTHON_VERSION)_$(PORT)_v$(OR_TOOLS_VERSION)
 
 BUILD_DOTNET ?= OFF
 BUILD_JAVA ?= OFF
diff --git a/tools/release/build_delivery_linux.sh b/tools/release/build_delivery_linux.sh
index 340b3c1824..9d0bffc8d6 100755
--- a/tools/release/build_delivery_linux.sh
+++ b/tools/release/build_delivery_linux.sh
@@ -192,18 +192,16 @@ function build_archive() {
   cd "${ROOT_DIR}" || exit 2
   make clean_archive
 
-  echo -n "Make archive..." | tee -a build.log
-  make archive UNIX_PYTHON_VER=3
-  echo "DONE" | tee -a build.log
-  echo -n "Test archive..." | tee -a build.log
-  make test_archive UNIX_PYTHON_VER=3
+  echo -n "Make cpp archive..." | tee -a build.log
+  make archive_cpp
   echo "DONE" | tee -a build.log
 
-  echo -n "Make flatzinc archive..." | tee -a build.log
-  make fz_archive UNIX_PYTHON_VER=3
+  echo -n "Make dotnet archive..." | tee -a build.log
+  make archive_dotnet
   echo "DONE" | tee -a build.log
-  echo -n "Test flatzinc archive..." | tee -a build.log
-  make test_fz_archive UNIX_PYTHON_VER=3
+
+  echo -n "Make java archive..." | tee -a build.log
+  make archive_java
   echo "DONE" | tee -a build.log
 
   # TODO(mizux) copy archives to export/
diff --git a/tools/release/build_delivery_mac.sh b/tools/release/build_delivery_mac.sh
index 6a8e434c5c..7f98fc6f79 100755
--- a/tools/release/build_delivery_mac.sh
+++ b/tools/release/build_delivery_mac.sh
@@ -199,18 +199,16 @@ function build_archive() {
   cd "${ROOT_DIR}" || exit 2
   make clean_archive
 
-  echo -n "Make archive..." | tee -a build.log
-  make archive UNIX_PYTHON_VER=3.9
-  echo "DONE" | tee -a build.log
-  echo -n "Test archive..." | tee -a build.log
-  make test_archive UNIX_PYTHON_VER=3.9
+  echo -n "Make cpp archive..." | tee -a build.log
+  make archive_cpp
   echo "DONE" | tee -a build.log
 
-  echo -n "Make flatzinc archive..." | tee -a build.log
-  make fz_archive UNIX_PYTHON_VER=3.9
+  echo -n "Make dotnet archive..." | tee -a build.log
+  make archive_dotnet
   echo "DONE" | tee -a build.log
-  echo -n "Test flatzinc archive..." | tee -a build.log
-  make test_fz_archive UNIX_PYTHON_VER=3.9
+
+  echo -n "Make java archive..." | tee -a build.log
+  make archive_java
   echo "DONE" | tee -a build.log
 
   mv or-tools_*.tar.gz export/
diff --git a/tools/release/build_delivery_win.cmd b/tools/release/build_delivery_win.cmd
index 1c0ced36b5..f9cf8f5991 100644
--- a/tools/release/build_delivery_win.cmd
+++ b/tools/release/build_delivery_win.cmd
@@ -218,14 +218,20 @@ echo Archive build seems up to date, skipping
 exit /B 0
 )
 
-make.exe archive WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
-echo make archive: DONE | tee.exe -a build.log
-make.exe test_archive WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
-echo make test_archive: DONE | tee.exe -a build.log
-make.exe fz_archive WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
-echo make fz_archive: DONE | tee.exe -a build.log
-make.exe test_fz_archive WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
-echo make test_fz_archive: DONE | tee.exe -a build.log
+REM Clean archive
+make.exe clean_archive WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
+
+echo Make cpp archive... | tee.exe -a build.log
+make.exe archive_cpp WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
+echo DONE | tee.exe -a build.log
+
+echo Make dotnet archive... | tee.exe -a build.log
+make.exe archive_dotnet WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
+echo DONE | tee.exe -a build.log
+
+echo Make java archive... | tee.exe -a build.log
+make.exe archive_java WINDOWS_PATH_TO_PYTHON=c:\python39-64 || exit 1
+echo DONE | tee.exe -a build.log
 
 for %%i in (or-tools_*VisualStudio2019-64bit*.zip) do (
   echo Move %%i to export... | tee.exe -a build.log