diff --git a/Dockerfile b/Dockerfile
index b64a74dd9820f157ec067e7113a323c8ff996018..d7588cfb48f932581443f68b7fdc94bc5de497b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 FROM debian:12
 LABEL Authors="Marco Malavolti <marco.malavolti@garr.it>"
 
-ENV CHROME_VERSION="115.0.5790.170-1"
-ENV CHROMEDRIVER_VERSION="115.0.5790.110"
-ENV PYFF_VERSION="2.0.0"
+ARG CHROME_VERSION
+ARG CHROMEDRIVER_VERSION
+ARG PYFF_VERSION
 
 #COPY --from=hairyhenderson/gomplate:v3.11.5 /gomplate /bin/gomplate
 
@@ -18,9 +18,11 @@ RUN apt-get update \
     python3-requests python3-selenium python3-urllib3 --no-install-recommends \
     && sed -i -e 's/"syntax on/syntax on/g' /etc/vim/vimrc
 
+RUN python3 -m pip install pyff==${PYFF_VERSION} --break-system-packages
+
 # Install PyFF
-RUN python3 -m pip install pyff==$PYFF_VERSION --break-system-packages \
-    && sed 's/random.seed(self)/random.seed(id(self))/' -i $(find /usr -name repo.py) # Until the commit https://github.com/IdentityPython/pyFF/commit/601f796776a1948bf09278e6f7ad4c1266904992 will not be implemented into a new PyFF release
+#RUN python3 -m pip install pyff==${PYFF_VERSION} --break-system-packages \
+#    && sed 's/random.seed(self)/random.seed(id(self))/' -i $(find /usr -name repo.py) # Until the commit https://github.com/IdentityPython/pyFF/commit/601f796776a1948bf09278e6f7ad4c1266904992 will not be implemented into a new PyFF release
 
 # Get Google Chrome & Google Chrome Driver
 # Check available versions here: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
@@ -34,7 +36,8 @@ USER eccs
 WORKDIR /home/eccs
 
 # Google Chrome Driver
-RUN wget "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip" -O chromedriver_linux64.zip \
+RUN wget "https://storage.googleapis.com/chrome-for-testing-public/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip" -O chromedriver_linux64.zip \
+
     && unzip chromedriver_linux64.zip \
     && rm chromedriver_linux64.zip \
     && mv chromedriver-linux64/chromedriver . \
diff --git a/docker-compose.yml b/docker-compose.yml
index b461c1735198a2f1568e0cf9df073cea57560243..6554c8014ead1d8852fe1b9684f9935ea5365ffb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,15 @@
-version: '3.9'
 services:
   eccs:
     image: gitlab.software.geant.org:5050/edugain/eccs:dev
     build: 
       context: .
       dockerfile: Dockerfile
+      args:
+        CHROME_VERSION: "126.0.6478.126-1"
+        CHROMEDRIVER_VERSION: "126.0.6478.126"
+        PYFF_VERSION: "2.1.2"
     container_name: eccs
     hostname: eccs
-      #env_file:
-      #  - .env
     ports:
       - 80:80
       - 443:443