diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d4139d9..88cb84f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,19 +69,20 @@ variables:
 .debian-vars:
   variables:
     FDO_DISTRIBUTION_VERSION: 'bookworm-slim'
-    FDO_DISTRIBUTION_TAG: '2024-10-01.0' # Bump this version on every ci-install.sh or dist version change
+    # Bump this version on every ci-install.sh or dist version change
+    FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH"
 
 .opensuse-vars:
   variables:
     FDO_DISTRIBUTION_VERSION: 'leap'
-    FDO_DISTRIBUTION_TAG: '2025-02-27.0' # Bump this version on every ci-install.sh or dist version change
+    FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH"
 
 .freebsd-vars:
   variables:
     BUILD_OS: freebsd
     BUILD_ARCH: "x86_64"
     FDO_DISTRIBUTION_VERSION: '13.1'
-    FDO_DISTRIBUTION_TAG: '2022-09-21.0'  # Bump this version on every ci-install.sh or dist version change
+    FDO_DISTRIBUTION_TAG: "2025-02-27.0-$UPSTREAM_BRANCH"
     FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
 
 .cmake-common: