diff --git a/base/config_files/docker_nightly_run.sh b/base/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/config_files/docker_nightly_run.sh
+++ b/base/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/generate_tags.sh b/base/generate_tags.sh
index 7b7873eb..d9e51c21 100755
--- a/base/generate_tags.sh
+++ b/base/generate_tags.sh
@@ -41,6 +41,15 @@ generate_image()
             s/{PHP_TAG}/'"${version}"'/
         ' Dockerfile.model > images/$folder/Dockerfile
 
+    if [[ $version = *"7.1"* || $version = *"7.2"* || $version = *"7.3"* || $version = *"7.4"* ]]; then
+        local before='RUN docker-php-ext-configure gd --with-freetype=\/usr\/include\/ --with-jpeg=\/usr\/include\/ --with-webp=\/usr\/include'
+        local after='# PHP < 7.4 have an old syntax to install GD. See https:\/\/github.com\/docker-library\/php\/issues\/912\nRUN docker-php-ext-configure gd --with-freetype-dir=\/usr\/include\/ --with-jpeg-dir=\/usr\/include\/ --with-webp-dir=\/usr\/include'
+
+        sed -i '
+            s/'"${before}"'/'"${after}"'/
+        ' images/$folder/Dockerfile
+    fi
+
     cp -R config_files images/$folder/
     sed '
             s/{PHP_CMD}/'"${exec}"'/
diff --git a/base/images/7.1-apache/config_files/docker_nightly_run.sh b/base/images/7.1-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.1-apache/config_files/docker_nightly_run.sh
+++ b/base/images/7.1-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.1-fpm/config_files/docker_nightly_run.sh b/base/images/7.1-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.1-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/7.1-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.2-apache/config_files/docker_nightly_run.sh b/base/images/7.2-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.2-apache/config_files/docker_nightly_run.sh
+++ b/base/images/7.2-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.2-fpm/config_files/docker_nightly_run.sh b/base/images/7.2-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.2-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/7.2-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.3-apache/config_files/docker_nightly_run.sh b/base/images/7.3-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.3-apache/config_files/docker_nightly_run.sh
+++ b/base/images/7.3-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.3-fpm/config_files/docker_nightly_run.sh b/base/images/7.3-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.3-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/7.3-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.4-apache/config_files/docker_nightly_run.sh b/base/images/7.4-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.4-apache/config_files/docker_nightly_run.sh
+++ b/base/images/7.4-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/7.4-fpm/config_files/docker_nightly_run.sh b/base/images/7.4-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/7.4-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/7.4-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.0-apache/config_files/docker_nightly_run.sh b/base/images/8.0-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.0-apache/config_files/docker_nightly_run.sh
+++ b/base/images/8.0-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.0-fpm/config_files/docker_nightly_run.sh b/base/images/8.0-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.0-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/8.0-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.1-apache/config_files/docker_nightly_run.sh b/base/images/8.1-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.1-apache/config_files/docker_nightly_run.sh
+++ b/base/images/8.1-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.1-fpm/config_files/docker_nightly_run.sh b/base/images/8.1-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.1-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/8.1-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.2-apache/config_files/docker_nightly_run.sh b/base/images/8.2-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.2-apache/config_files/docker_nightly_run.sh
+++ b/base/images/8.2-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.2-fpm/config_files/docker_nightly_run.sh b/base/images/8.2-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.2-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/8.2-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.3-apache/config_files/docker_nightly_run.sh b/base/images/8.3-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.3-apache/config_files/docker_nightly_run.sh
+++ b/base/images/8.3-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.3-fpm/config_files/docker_nightly_run.sh b/base/images/8.3-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.3-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/8.3-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.4-apache/config_files/docker_nightly_run.sh b/base/images/8.4-apache/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.4-apache/config_files/docker_nightly_run.sh
+++ b/base/images/8.4-apache/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/base/images/8.4-fpm/config_files/docker_nightly_run.sh b/base/images/8.4-fpm/config_files/docker_nightly_run.sh
index f88c8a67..cd7b0d4c 100755
--- a/base/images/8.4-fpm/config_files/docker_nightly_run.sh
+++ b/base/images/8.4-fpm/config_files/docker_nightly_run.sh
@@ -2,7 +2,7 @@
 
 # Download nightly build
 if [ ! -d /tmp/data-ps ]; then
-    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E 'develop.+\.zip$$' | tail -1` /tmp/prestashop.zip
+    gsutil cp `gsutil ls gs://prestashop-core-nightly/ | grep -E '$PS_VERSION.+\.zip$' | tail -1` /tmp/prestashop.zip
 
     mkdir -p /tmp/data-ps
     unzip -q /tmp/prestashop.zip -d /tmp/data-ps/
diff --git a/images/1.7.8.x/7.1-apache/Dockerfile b/images/1.7.8.x/7.1-apache/Dockerfile
index a2baefce..a3418dc0 100644
--- a/images/1.7.8.x/7.1-apache/Dockerfile
+++ b/images/1.7.8.x/7.1-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.1-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.1-fpm/Dockerfile b/images/1.7.8.x/7.1-fpm/Dockerfile
index dff436db..bc4bad38 100644
--- a/images/1.7.8.x/7.1-fpm/Dockerfile
+++ b/images/1.7.8.x/7.1-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.1-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.2-apache/Dockerfile b/images/1.7.8.x/7.2-apache/Dockerfile
index 1007c302..d7a36e76 100644
--- a/images/1.7.8.x/7.2-apache/Dockerfile
+++ b/images/1.7.8.x/7.2-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.2-fpm/Dockerfile b/images/1.7.8.x/7.2-fpm/Dockerfile
index c69a35d0..73a5cc72 100644
--- a/images/1.7.8.x/7.2-fpm/Dockerfile
+++ b/images/1.7.8.x/7.2-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.3-apache/Dockerfile b/images/1.7.8.x/7.3-apache/Dockerfile
index 3cef388f..4442c0d3 100644
--- a/images/1.7.8.x/7.3-apache/Dockerfile
+++ b/images/1.7.8.x/7.3-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.3-fpm/Dockerfile b/images/1.7.8.x/7.3-fpm/Dockerfile
index 2abd1284..53f8e7f9 100644
--- a/images/1.7.8.x/7.3-fpm/Dockerfile
+++ b/images/1.7.8.x/7.3-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.4-apache/Dockerfile b/images/1.7.8.x/7.4-apache/Dockerfile
index 0c2207c5..bd9b222b 100644
--- a/images/1.7.8.x/7.4-apache/Dockerfile
+++ b/images/1.7.8.x/7.4-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/1.7.8.x/7.4-fpm/Dockerfile b/images/1.7.8.x/7.4-fpm/Dockerfile
index 8079cdcd..0df83352 100644
--- a/images/1.7.8.x/7.4-fpm/Dockerfile
+++ b/images/1.7.8.x/7.4-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 1.7.8.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=1.7.8.x
-ENV NODE_VERSION=v14.20.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/7.2-apache/Dockerfile b/images/8.0.x/7.2-apache/Dockerfile
index 68b0be92..ed375f7c 100644
--- a/images/8.0.x/7.2-apache/Dockerfile
+++ b/images/8.0.x/7.2-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/7.2-fpm/Dockerfile b/images/8.0.x/7.2-fpm/Dockerfile
index d11e5dfc..6b149b7a 100644
--- a/images/8.0.x/7.2-fpm/Dockerfile
+++ b/images/8.0.x/7.2-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/7.3-apache/Dockerfile b/images/8.0.x/7.3-apache/Dockerfile
index bc71e53f..ca3481d6 100644
--- a/images/8.0.x/7.3-apache/Dockerfile
+++ b/images/8.0.x/7.3-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/7.3-fpm/Dockerfile b/images/8.0.x/7.3-fpm/Dockerfile
index 83ea9593..48e9edd4 100644
--- a/images/8.0.x/7.3-fpm/Dockerfile
+++ b/images/8.0.x/7.3-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/7.4-apache/Dockerfile b/images/8.0.x/7.4-apache/Dockerfile
index e826d7c2..e7d1c1bc 100644
--- a/images/8.0.x/7.4-apache/Dockerfile
+++ b/images/8.0.x/7.4-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/7.4-fpm/Dockerfile b/images/8.0.x/7.4-fpm/Dockerfile
index 0da8b946..ef636719 100644
--- a/images/8.0.x/7.4-fpm/Dockerfile
+++ b/images/8.0.x/7.4-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/8.0-apache/Dockerfile b/images/8.0.x/8.0-apache/Dockerfile
index ecb3aed7..6d3b6d41 100644
--- a/images/8.0.x/8.0-apache/Dockerfile
+++ b/images/8.0.x/8.0-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.0-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/8.0-fpm/Dockerfile b/images/8.0.x/8.0-fpm/Dockerfile
index 9123b12a..82869fca 100644
--- a/images/8.0.x/8.0-fpm/Dockerfile
+++ b/images/8.0.x/8.0-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.0-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/8.1-apache/Dockerfile b/images/8.0.x/8.1-apache/Dockerfile
index d7eee3cf..8cc82999 100644
--- a/images/8.0.x/8.1-apache/Dockerfile
+++ b/images/8.0.x/8.1-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.0.x/8.1-fpm/Dockerfile b/images/8.0.x/8.1-fpm/Dockerfile
index 3313064b..032d17b9 100644
--- a/images/8.0.x/8.1-fpm/Dockerfile
+++ b/images/8.0.x/8.1-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.0.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/7.2-apache/Dockerfile b/images/8.1.x/7.2-apache/Dockerfile
index cf23ee23..5befe567 100644
--- a/images/8.1.x/7.2-apache/Dockerfile
+++ b/images/8.1.x/7.2-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/7.2-fpm/Dockerfile b/images/8.1.x/7.2-fpm/Dockerfile
index 6ad974ee..791c8577 100644
--- a/images/8.1.x/7.2-fpm/Dockerfile
+++ b/images/8.1.x/7.2-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/7.3-apache/Dockerfile b/images/8.1.x/7.3-apache/Dockerfile
index 33350097..11633d21 100644
--- a/images/8.1.x/7.3-apache/Dockerfile
+++ b/images/8.1.x/7.3-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/7.3-fpm/Dockerfile b/images/8.1.x/7.3-fpm/Dockerfile
index 3fc2809b..58c49e56 100644
--- a/images/8.1.x/7.3-fpm/Dockerfile
+++ b/images/8.1.x/7.3-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/7.4-apache/Dockerfile b/images/8.1.x/7.4-apache/Dockerfile
index b64b0fde..d56acb66 100644
--- a/images/8.1.x/7.4-apache/Dockerfile
+++ b/images/8.1.x/7.4-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/7.4-fpm/Dockerfile b/images/8.1.x/7.4-fpm/Dockerfile
index e842e386..b7626f3d 100644
--- a/images/8.1.x/7.4-fpm/Dockerfile
+++ b/images/8.1.x/7.4-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/8.0-apache/Dockerfile b/images/8.1.x/8.0-apache/Dockerfile
index 4d06244e..bce2d663 100644
--- a/images/8.1.x/8.0-apache/Dockerfile
+++ b/images/8.1.x/8.0-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.0-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/8.0-fpm/Dockerfile b/images/8.1.x/8.0-fpm/Dockerfile
index 54565ae6..9e6c1666 100644
--- a/images/8.1.x/8.0-fpm/Dockerfile
+++ b/images/8.1.x/8.0-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.0-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/8.1-apache/Dockerfile b/images/8.1.x/8.1-apache/Dockerfile
index 2e79f7e7..618716b3 100644
--- a/images/8.1.x/8.1-apache/Dockerfile
+++ b/images/8.1.x/8.1-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.1.x/8.1-fpm/Dockerfile b/images/8.1.x/8.1-fpm/Dockerfile
index 24afc4a3..181c8e57 100644
--- a/images/8.1.x/8.1-fpm/Dockerfile
+++ b/images/8.1.x/8.1-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.1.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.1.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/7.2-apache/Dockerfile b/images/8.2.x/7.2-apache/Dockerfile
index 82f3472d..849def3e 100644
--- a/images/8.2.x/7.2-apache/Dockerfile
+++ b/images/8.2.x/7.2-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/7.2-fpm/Dockerfile b/images/8.2.x/7.2-fpm/Dockerfile
index f230aada..71e5da3b 100644
--- a/images/8.2.x/7.2-fpm/Dockerfile
+++ b/images/8.2.x/7.2-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.2-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/7.3-apache/Dockerfile b/images/8.2.x/7.3-apache/Dockerfile
index 7a0d136d..da3d2afb 100644
--- a/images/8.2.x/7.3-apache/Dockerfile
+++ b/images/8.2.x/7.3-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/7.3-fpm/Dockerfile b/images/8.2.x/7.3-fpm/Dockerfile
index 8142be39..762a151b 100644
--- a/images/8.2.x/7.3-fpm/Dockerfile
+++ b/images/8.2.x/7.3-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.3-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/7.4-apache/Dockerfile b/images/8.2.x/7.4-apache/Dockerfile
index 83ff5c90..8427d59f 100644
--- a/images/8.2.x/7.4-apache/Dockerfile
+++ b/images/8.2.x/7.4-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/7.4-fpm/Dockerfile b/images/8.2.x/7.4-fpm/Dockerfile
index d525e9dd..4f614449 100644
--- a/images/8.2.x/7.4-fpm/Dockerfile
+++ b/images/8.2.x/7.4-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:7.4-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/8.0-apache/Dockerfile b/images/8.2.x/8.0-apache/Dockerfile
index 0ba88a68..af313e94 100644
--- a/images/8.2.x/8.0-apache/Dockerfile
+++ b/images/8.2.x/8.0-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.0-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/8.0-fpm/Dockerfile b/images/8.2.x/8.0-fpm/Dockerfile
index c198447b..f7c9ea7f 100644
--- a/images/8.2.x/8.0-fpm/Dockerfile
+++ b/images/8.2.x/8.0-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.0-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/8.1-apache/Dockerfile b/images/8.2.x/8.1-apache/Dockerfile
index cad24da0..591817cf 100644
--- a/images/8.2.x/8.1-apache/Dockerfile
+++ b/images/8.2.x/8.1-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/8.2.x/8.1-fpm/Dockerfile b/images/8.2.x/8.1-fpm/Dockerfile
index a4c6379a..c7813697 100644
--- a/images/8.2.x/8.1-fpm/Dockerfile
+++ b/images/8.2.x/8.1-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 8.2.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=8.2.x
-ENV NODE_VERSION=v16.20.2
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.1-apache/Dockerfile b/images/9.0.x/8.1-apache/Dockerfile
index b34fe655..49c7dad0 100644
--- a/images/9.0.x/8.1-apache/Dockerfile
+++ b/images/9.0.x/8.1-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=9.0.x
-ENV NODE_VERSION=v20.17.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.1-fpm/Dockerfile b/images/9.0.x/8.1-fpm/Dockerfile
index 880c7ac7..47747783 100644
--- a/images/9.0.x/8.1-fpm/Dockerfile
+++ b/images/9.0.x/8.1-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.1-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=9.0.x
-ENV NODE_VERSION=v20.17.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.2-apache/Dockerfile b/images/9.0.x/8.2-apache/Dockerfile
index 3e8d2de1..4682c828 100644
--- a/images/9.0.x/8.2-apache/Dockerfile
+++ b/images/9.0.x/8.2-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.2-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=9.0.x
-ENV NODE_VERSION=v20.17.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.2-fpm/Dockerfile b/images/9.0.x/8.2-fpm/Dockerfile
index fab44f6b..cebaad0b 100644
--- a/images/9.0.x/8.2-fpm/Dockerfile
+++ b/images/9.0.x/8.2-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.2-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=9.0.x
-ENV NODE_VERSION=v20.17.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.3-apache/Dockerfile b/images/9.0.x/8.3-apache/Dockerfile
index 142d08a1..b65b6cea 100644
--- a/images/9.0.x/8.3-apache/Dockerfile
+++ b/images/9.0.x/8.3-apache/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.3-apache
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=9.0.x
-ENV NODE_VERSION=v20.17.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.3-fpm/Dockerfile b/images/9.0.x/8.3-fpm/Dockerfile
index 22ca30c9..dbf2a238 100644
--- a/images/9.0.x/8.3-fpm/Dockerfile
+++ b/images/9.0.x/8.3-fpm/Dockerfile
@@ -1,10 +1,20 @@
 FROM prestashop/base:8.3-fpm
 LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
 
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
 RUN apt update
-RUN apt -y install git
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
 
-ENV PS_BRANCH=9.0.x
-ENV NODE_VERSION=v20.17.0
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
 
-CMD ["/tmp/docker_branch_run.sh"]
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.4-apache/Dockerfile b/images/9.0.x/8.4-apache/Dockerfile
new file mode 100644
index 00000000..b7d88bc6
--- /dev/null
+++ b/images/9.0.x/8.4-apache/Dockerfile
@@ -0,0 +1,20 @@
+FROM prestashop/base:8.4-apache
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
+RUN apt update
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
+
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
+
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/9.0.x/8.4-fpm/Dockerfile b/images/9.0.x/8.4-fpm/Dockerfile
new file mode 100644
index 00000000..39a276c2
--- /dev/null
+++ b/images/9.0.x/8.4-fpm/Dockerfile
@@ -0,0 +1,20 @@
+FROM prestashop/base:8.4-fpm
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION 9.0.x
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
+RUN apt update
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
+
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
+
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/nightly/8.4-apache/Dockerfile b/images/nightly/8.4-apache/Dockerfile
new file mode 100644
index 00000000..224568ae
--- /dev/null
+++ b/images/nightly/8.4-apache/Dockerfile
@@ -0,0 +1,20 @@
+FROM prestashop/base:8.4-apache
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION nightly
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
+RUN apt update
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
+
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
+
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/images/nightly/8.4-fpm/Dockerfile b/images/nightly/8.4-fpm/Dockerfile
new file mode 100644
index 00000000..606fe2d2
--- /dev/null
+++ b/images/nightly/8.4-fpm/Dockerfile
@@ -0,0 +1,20 @@
+FROM prestashop/base:8.4-fpm
+LABEL maintainer="PrestaShop Core Team <coreteam@prestashop.com>"
+
+ENV PS_VERSION nightly
+
+ENV PATH /root/google-cloud-sdk/bin/:$PATH
+
+RUN apt update
+RUN apt -y install \
+ python3 \
+ curl \
+ bash
+
+RUN curl -sSL https://sdk.cloud.google.com | bash
+RUN gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true && \
+    gcloud config set metrics/environment github_docker_image && \
+    gcloud --version
+
+CMD ["/tmp/docker_nightly_run.sh"]
diff --git a/prestashop_docker/generator.py b/prestashop_docker/generator.py
index 7e950251..f6638ef0 100644
--- a/prestashop_docker/generator.py
+++ b/prestashop_docker/generator.py
@@ -65,13 +65,15 @@ def generate_image(self, ps_version, container_version):
 
         template = self.nightly_template if (
             ps_version == self.NIGHTLY
-        ) else self.branch_template if (
+        ) else self.nightly_template if (
             split_version is not None and split_version['patch'] == 'x'
         ) else self.template
 
         # Get valid PS version (for branch versions it returns to future next patch)
-        ps_version = parsed_version['ps_version']
         branch_version = parsed_version['branch_version']
+        ps_version = branch_version if (
+            split_version is not None and split_version['patch'] == 'x'
+        ) else parsed_version['ps_version']
 
         if split_version is None:
             node_version = 'v20.17.0'
diff --git a/tests/prestashop_docker/test_generator.py b/tests/prestashop_docker/test_generator.py
index 4ea25fb2..4d25a821 100644
--- a/tests/prestashop_docker/test_generator.py
+++ b/tests/prestashop_docker/test_generator.py
@@ -140,7 +140,7 @@ def test_generate_nightly_image(self):
             self.assertIn('PS_VERSION: nightly', content)
             self.assertIn('CONTAINER_VERSION: 7.2-alpine', content)
 
-    def test_generate_branch_image(self):
+    def test_generate_nightly_90x_image(self):
         dockerfile = '/tmp/images/9.0.x/8.1-alpine/Dockerfile'
         self.assertFalse(path.exists(dockerfile))
         self.generator.generate_image(
@@ -155,10 +155,29 @@ def test_generate_branch_image(self):
                 'PS_URL',
                 content
             )
+
+            self.assertIn('PS_VERSION: 9.0.x', content)
             self.assertIn('CONTAINER_VERSION: 8.1-alpine', content)
-            self.assertIn('RUN apt -y install git', content)
-            self.assertIn('ENV PS_BRANCH=9.0.x', content)
-            self.assertIn('ENV NODE_VERSION=v20.17.0', content)
+
+    # def test_generate_branch_image(self):
+    #     dockerfile = '/tmp/images/9.0.x/8.1-alpine/Dockerfile'
+    #     self.assertFalse(path.exists(dockerfile))
+    #     self.generator.generate_image(
+    #         '9.0.x',
+    #         '8.1-alpine'
+    #     )
+    #     self.assertTrue(path.exists(dockerfile))
+
+    #     with open(dockerfile) as f:
+    #         content = f.read()
+    #         self.assertNotIn(
+    #             'PS_URL',
+    #             content
+    #         )
+    #         self.assertIn('CONTAINER_VERSION: 8.1-alpine', content)
+    #         self.assertIn('RUN apt -y install git', content)
+    #         self.assertIn('ENV PS_BRANCH=9.0.x', content)
+    #         self.assertIn('ENV NODE_VERSION=v20.17.0', content)
 
     def test_generate_all(self):
         files = (
diff --git a/versions.py b/versions.py
index 52d49a0a..01f4dce9 100644
--- a/versions.py
+++ b/versions.py
@@ -292,10 +292,12 @@
         '8.1',
         '8.2',
         '8.3',
+        '8.4',
     ),
     'nightly': (
         '8.1',
         '8.2',
         '8.3',
+        '8.4',
     ),
 }