diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml
index ac8663fc..15ca5f2b 100644
--- a/.cirrus/tasks.yml
+++ b/.cirrus/tasks.yml
@@ -16,8 +16,8 @@ env:
   GCLOUD_STAGING_REGISTRY: gcr.io/sonarqube-marketplace-provider
   GCLOUD_STAGING_PRODUCT_NAME: sonarqube-dce-staging
   CURRENT_LTA_VERSION: 9.9.8
-  CURRENT_VERSION: 2025.1
-  NEXT_VERSION: 2025.1
+  CURRENT_VERSION: 2025.1.0
+  NEXT_VERSION: 2025.1.0
 
   # Must be in the format YY.MM.0.###### where ###### is the build number
   COMMUNITY_BUILD_VERSION: 25.1.0.102122
@@ -51,11 +51,15 @@ multi_arch_build_gcp_prod_task:
     - echo "Promote the ${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-app images supporting two architectures (linux/amd64 and linux/arm64) to the GCP registry ${GCLOUD_REGISTRY}"
     - docker tag "${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-app" "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_VERSION}"
     - docker tag "${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-app" "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_MINOR_VERSION}"
+    - echo -e "FROM ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_VERSION}\nLABEL com.googleapis.cloudmarketplace.product.service.name=services/sonarqube-dce" | docker build -t ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_VERSION} -
+    - echo -e "FROM ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_MINOR_VERSION}\nLABEL com.googleapis.cloudmarketplace.product.service.name=services/sonarqube-dce" | docker build -t ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_MINOR_VERSION} -
     - docker push "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_VERSION}"
     - docker push "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}:${CURRENT_MINOR_VERSION}"
     - echo "Promote the ${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-search images supporting two architectures (linux/amd64 and linux/arm64) to the GCP registry ${GCLOUD_REGISTRY}"
     - docker tag "${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-search" "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_VERSION}"
     - docker tag "${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-search" "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION}"
+    - echo -e "FROM ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_VERSION}\nLABEL com.googleapis.cloudmarketplace.product.service.name=services/sonarqube-dce" | docker build -t ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_VERSION} -
+    - echo -e "FROM ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION}\nLABEL com.googleapis.cloudmarketplace.product.service.name=services/sonarqube-dce" | docker build -t ${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION} -
     - docker push "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_VERSION}"
     - docker push "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION}"
 
@@ -119,13 +123,13 @@ multi_arch_build_2025_x_task:
   skip: "!changesInclude('2025.1/**/*') && !changesInclude('.cirrus/*')"
   env:
     matrix:
-      - version: ${NEXT_VERSION}/developer
+      - version: 2025.1/developer
         tag: ${NEXT_VERSION}-developer
-      - version: ${NEXT_VERSION}/enterprise
+      - version: 2025.1/enterprise
         tag: ${NEXT_VERSION}-enterprise
-      - version: ${NEXT_VERSION}/datacenter/app
+      - version: 2025.1/datacenter/app
         tag: ${NEXT_VERSION}-datacenter-app
-      - version: ${NEXT_VERSION}/datacenter/search
+      - version: 2025.1/datacenter/search
         tag: ${NEXT_VERSION}-datacenter-search
 
 multi_arch_build_community_build_task:
diff --git a/2025.1/datacenter/app/Dockerfile b/2025.1/datacenter/app/Dockerfile
index c384f2b5..db676753 100644
--- a/2025.1/datacenter/app/Dockerfile
+++ b/2025.1/datacenter/app/Dockerfile
@@ -6,6 +6,7 @@ LABEL io.openshift.min-memory=2048M
 LABEL io.openshift.non-scalable=false
 LABEL io.openshift.tags=sonarqube,static-code-analysis,code-quality,clean-code
 LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+LABEL com.googleapis.cloudmarketplace.product.service.name=services/sonarqube-dce
 
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
diff --git a/2025.1/datacenter/search/Dockerfile b/2025.1/datacenter/search/Dockerfile
index 94997f9e..42865517 100644
--- a/2025.1/datacenter/search/Dockerfile
+++ b/2025.1/datacenter/search/Dockerfile
@@ -6,6 +6,7 @@ LABEL io.openshift.min-memory=2048M
 LABEL io.openshift.non-scalable=false
 LABEL io.openshift.tags=sonarqube,static-code-analysis,code-quality,clean-code
 LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+LABEL com.googleapis.cloudmarketplace.product.service.name=services/sonarqube-dce
 
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US:en' \
diff --git a/release.md b/release.md
index b606aa7f..3e110772 100644
--- a/release.md
+++ b/release.md
@@ -11,10 +11,10 @@ Release of a new version of the official SonarQube Server Docker images is made
 1. Set the new version of SonarQube Server (`SONARQUBE_VERSION`) to be released in the Dockerfiles. In case of community build, please remember to update `community-build/Dockerfile` only.
 2. If you are releasing a new LTA, set `CURRENT_LTA_VERSION` in `.cirrus/tasks.yml`. Otherwise, if you are releasing a Community build, set `COMMUNITY_BUILD_VERSION` only. In all the other cases where a paid edition is about to be releases, set `CURRENT_VERSION` (please note that the nightly build will fail before the public image becomes available).
 3. Update the docker hub SonarQube Server's documentation (if applicable)
-4. Add a GIT tag for the new version
-   1. If you are releasing a SonarQube Server version, you need to [Draft a New Release](https://github.com/SonarSource/docker-sonarqube/releases/new), where the name matches "SonarQube Server 2025.", followed by the month version, i.e., "SonarQube Server 2025.1".
-   2. Likewise, if you are releasing a Community Build, the release name should match "Community Build", followed by the month version, i.e., "Community Build 25.1".
-5. Update Docker Hub's SonarQube Server images
+4. Update Docker Hub's SonarQube Server images
+5. Add a GIT tag for the new version (This needs to be done after the images become available on DockerHub)
+   1. If you are releasing a SonarQube Server version, you need to [Add a New Release](https://github.com/SonarSource/docker-sonarqube/releases/new), where the name matches "SonarQube Server", followed by the release version, e.g., "SonarQube Server 2025.1.0".
+   2. Likewise, if you are releasing a Community Build, the release name should match "Community Build", followed by the release version, e.g., "Community Build 25.1.102122".
 
 ## Bump the version of SonarQube Server in Dockerfiles