diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index 43b69a1033..220912fa68 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -100,13 +100,13 @@ help:
 	@echo -e "\t\t${BOLD}fedora-39${RESET}"
 	@echo -e "\t\t${BOLD}fedora-38${RESET}"
 	@echo -e "\t\t${BOLD}fedora-37${RESET}"
+	@echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)"
+	@echo -e "\t\t${BOLD}rockylinux-9${RESET} (latest)"
 	@echo -e "\t\t${BOLD}ubuntu-24.04${RESET} (Ubuntu 24.04 LTS, latest)"
 	@echo -e "\t\t${BOLD}ubuntu-23.10${RESET} (Ubuntu 23.10, rolling)"
 	@echo -e "\t\t${BOLD}ubuntu-23.04${RESET} (Ubuntu 23.04)"
 	@echo -e "\t\t${BOLD}ubuntu-22.04${RESET} (Ubuntu 22.04 LTS)"
 	@echo -e "\t\t${BOLD}ubuntu-20.04${RESET} (Ubuntu 20.04 LTS)"
-	@echo -e "\t\t${BOLD}opensuse-leap${RESET} (latest)"
-	@echo -e "\t\t${BOLD}rockylinux-9${RESET} (latest)"
 	@echo
 	@echo -e "\t${BOLD}<stage>${RESET}:"
 	@echo -e "\t\t${BOLD}env${RESET}"
@@ -150,7 +150,7 @@ OR_TOOLS_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 OR_TOOLS_SHA1 := $(shell git rev-parse --verify HEAD)
 # OR_TOOLS_MAJOR & OR_TOOLS_MINOR
 include ../../Version.txt
-OR_TOOLS_PATCH := $(shell git rev-list --count v${OR_TOOLS_MAJOR}.0..HEAD)
+OR_TOOLS_PATCH := $(shell git rev-list --count v${OR_TOOLS_MAJOR}.0..HEAD || echo 0)
 OR_TOOLS_VERSION := ${OR_TOOLS_MAJOR}.${OR_TOOLS_MINOR}.${OR_TOOLS_PATCH}
 ifdef PRE_RELEASE
 OR_TOOLS_VERSION := ${OR_TOOLS_VERSION}-rc
@@ -412,9 +412,9 @@ DISTROS := \
  archlinux \
  debian-11 debian-12 debian-sid \
  fedora-37 fedora-38 fedora-39 \
- ubuntu-20.04 ubuntu-22.04 ubuntu-23.04 ubuntu-23.10 ubuntu-24.04 \
  opensuse-leap \
- rockylinux-9
+ rockylinux-9 \
+ ubuntu-20.04 ubuntu-22.04 ubuntu-23.04 ubuntu-23.10 ubuntu-24.04
 
 # List of stages
 STAGES := env devel
diff --git a/tools/docker/python/amd64/manylinux.Dockerfile b/tools/docker/python/amd64/manylinux.Dockerfile
index ec2eb479eb..cd0fe6f67a 100644
--- a/tools/docker/python/amd64/manylinux.Dockerfile
+++ b/tools/docker/python/amd64/manylinux.Dockerfile
@@ -19,18 +19,18 @@ RUN wget -q --no-check-certificate "https://cmake.org/files/v3.28/cmake-3.28.3-l
 && ./cmake-3.28.3-linux-x86_64.sh --prefix=/usr --skip-license \
 && rm cmake-3.28.3-linux-x86_64.sh
 
-# Install Swig 4.1.1
+# Install SWIG 4.2.1
 RUN curl --location-trusted \
- --remote-name "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.1.1.tar.gz" \
- -o swig-4.1.1.tar.gz \
-&& tar xvf swig-4.1.1.tar.gz \
-&& rm swig-4.1.1.tar.gz \
-&& cd swig-4.1.1 \
+ --remote-name "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" \
+ -o swig-4.2.1.tar.gz \
+&& tar xvf swig-4.2.1.tar.gz \
+&& rm swig-4.2.1.tar.gz \
+&& cd swig-4.2.1 \
 && ./configure --prefix=/usr/local \
 && make -j 4 \
 && make install \
 && cd .. \
-&& rm -rf swig-4.1.1
+&& rm -rf swig-4.2.1
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/tools/docker/python/arm64v8/manylinux.Dockerfile b/tools/docker/python/arm64v8/manylinux.Dockerfile
index 10e51382ed..936544a7e5 100644
--- a/tools/docker/python/arm64v8/manylinux.Dockerfile
+++ b/tools/docker/python/arm64v8/manylinux.Dockerfile
@@ -21,18 +21,18 @@ RUN wget -q --no-check-certificate "https://cmake.org/files/v3.28/cmake-3.28.3-l
 && ./cmake-3.28.3-linux-aarch64.sh --prefix=/usr --skip-license \
 && rm cmake-3.28.3-linux-aarch64.sh
 
-# Install Swig 4.1.1
+# Install SWIG 4.2.1
 RUN curl --location-trusted \
- --remote-name "https://downloads.sourceforge.net/project/swig/swig/swig-4.1.1/swig-4.1.1.tar.gz" \
- -o swig-4.1.1.tar.gz \
-&& tar xvf swig-4.1.1.tar.gz \
-&& rm swig-4.1.1.tar.gz \
-&& cd swig-4.1.1 \
+ --remote-name "https://downloads.sourceforge.net/project/swig/swig/swig-4.2.1/swig-4.2.1.tar.gz" \
+ -o swig-4.2.1.tar.gz \
+&& tar xvf swig-4.2.1.tar.gz \
+&& rm swig-4.2.1.tar.gz \
+&& cd swig-4.2.1 \
 && ./configure --prefix=/usr/local \
 && make -j 4 \
 && make install \
 && cd .. \
-&& rm -rf swig-4.1.1
+&& rm -rf swig-4.2.1
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone