diff --git a/.github/workflows/rucio-release-images.yml b/.github/workflows/rucio-release-images.yml
index c151365..1b222ac 100644
--- a/.github/workflows/rucio-release-images.yml
+++ b/.github/workflows/rucio-release-images.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Build the Docker Image
         run: |
-          buildah build --build-arg RUCIO_VERSION=${{ env.rucio_version }} --file docker/${{ matrix.image }}/Dockerfile --tag registry.cern.ch/${{ vars.HARBOR_REPOSITORY }}/${{ matrix.image }}:${{ env.tag }} .
+          buildah build --build-arg RUCIO_VERSION=${{ env.rucio_version }} --build-arg CMSRUCIO_GITTAG=${{ env.tag }} --file docker/${{ matrix.image }}/Dockerfile --tag registry.cern.ch/${{ vars.HARBOR_REPOSITORY }}/${{ matrix.image }}:${{ env.tag }} .
 
       - name: Push the Docker Image
         run: |
diff --git a/docker/rucio_client/Dockerfile b/docker/rucio_client/Dockerfile
index b4ac193..5598cdb 100644
--- a/docker/rucio_client/Dockerfile
+++ b/docker/rucio_client/Dockerfile
@@ -1,6 +1,7 @@
 FROM almalinux:9
 
 ARG RUCIO_VERSION
+ARG CMSRUCIO_GITTAG
 
 RUN dnf upgrade -y && \
     dnf clean all && \
@@ -58,6 +59,7 @@ RUN git clone https://github.com/rucio/rucio.git
 # Pull some useful stuff out of git
 WORKDIR /root
 RUN git clone https://github.com/dmwm/CMSRucio.git
+RUN cd CMSRucio && git checkout $CMSRUCIO_GITTAG
 
 RUN mkdir -p /etc/grid-security ; ln -s /cvmfs/grid.cern.ch/etc/grid-security/certificates /etc/grid-security/