diff --git a/containerfiles/Containerfile b/containerfiles/Containerfile
index f6e21c9..07645f3 100644
--- a/containerfiles/Containerfile
+++ b/containerfiles/Containerfile
@@ -36,7 +36,7 @@ RUN cp $(which openvpn) /output/
 # ------------------------------------------------------
 # -- Final container
 # ------------------------------------------------------
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="allanger <allanger@zohomail.com>"
 COPY --from=builder /output /src
 # -------------------------------------------------------
diff --git a/containerfiles/Containerfile-XOR b/containerfiles/Containerfile-XOR
index 75cc83c..6bbf2ca 100644
--- a/containerfiles/Containerfile-XOR
+++ b/containerfiles/Containerfile-XOR
@@ -23,7 +23,7 @@ RUN dudo -l "https://github.com/Tunnelblick/Tunnelblick/archive/refs/tags/v{{ ve
 RUN tar -xf /tmp/tunnelblick.tar.gz  -C /tmp && rm -f /tmp/tunnelblick.tar.gz
 RUN mv /tmp/Tunnelblick-$TUNNELBLICK_VERSION /output/tunnelblick
 
-FROM ubuntu as builder
+FROM ubuntu:24.04 as builder
 # ------------------------------------------------------
 # -- TODO: Define it only once
 # ------------------------------------------------------
@@ -48,7 +48,7 @@ RUN cp $(which openvpn) /output/
 # ------------------------------------------------------
 # -- Final container
 # ------------------------------------------------------
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="allanger <allanger@zohomail.com>"
 COPY --from=builder /output /src
 # -------------------------------------------------------
diff --git a/scripts/build_xor.sh b/scripts/build_xor.sh
index b81a65c..a152b0c 100755
--- a/scripts/build_xor.sh
+++ b/scripts/build_xor.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 git clone https://github.com/Tunnelblick/Tunnelblick.git /tmp/tunnelblick
+git -C /tmp/tunnelblick checkout $TUNNELBLICK_VERSION
 export OPENVPN_VERSION=$(ls /tmp/tunnelblick/third_party/sources/openvpn | sed 's/openvpn-//g' | sort  -k1,1nr -k2,2n -k3,3n | head -n 1)
 export CUSTOM_TAG="v$OPENVPN_VERSION-XOR-$TUNNELBLICK_VERSION"
 export BUILD_ARGS="--build-arg OPENVPN_VERSION=$OPENVPN_VERSION --build-arg TUNNELBLICK_VERSION=$TUNNELBLICK_VERSION"
-build-container
\ No newline at end of file
+build-container