diff --git a/.gitlab-ci/Jobs/build_image.yml b/.gitlab-ci/Jobs/build_image.yml
index 3a057dc..39d6a89 100644
--- a/.gitlab-ci/Jobs/build_image.yml
+++ b/.gitlab-ci/Jobs/build_image.yml
@@ -1,4 +1,4 @@
-.build-template:
+passbolt-prerelease:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -11,20 +11,4 @@
         --build-arg PASSBOLT_BASE_PACKAGES="$PASSBOLT_BASE_PACKAGES" \
         --build-arg PASSBOLT_DEV_PACKAGES="$PASSBOLT_DEV_PACKAGES" \
         --dockerfile $CI_PROJECT_DIR/Dockerfile \
-        --destination $CI_REGISTRY_IMAGE:$PASSBOLT_FLAVOUR-$CI_COMMIT_TAG
-
-passbolt-ce-prerelease:
-  extends: .build-template
-  variables:
-    PHP_EXTENSIONS: "gnupg redis mcrypt"
-    PASSBOLT_BASE_PACKAGES: "nginx gnupg libgpgme11 libmcrypt4 mysql-client supervisor cron"
-    PASSBOLT_DEV_PACKAGES: "libpng-dev libjpeg62-turbo-dev libicu-dev libxslt1-dev libmcrypt-dev unzip git"
-    PASSBOLT_FLAVOUR: "passbolt-ce"
-
-passbolt-pro-prerelease:
-  extends: .build-template
-  variables:
-    PHP_EXTENSIONS: "gnupg redis mcrypt ldap"
-    PASSBOLT_BASE_PACKAGES: "nginx gnupg libgpgme11 libmcrypt4 mysql-client supervisor cron"
-    PASSBOLT_DEV_PACKAGES: "libldap2-dev libpng-dev libjpeg62-turbo-dev libicu-dev libxslt1-dev libmcrypt-dev unzip git"
-    PASSBOLT_FLAVOUR: "passbolt-pro"
+        --destination $CI_REGISTRY_IMAGE:$PASSBOLT_FLAVOUR-$UPSTREAM_COMMIT_SHA