diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 619dcd5f..86cc68b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,11 +42,11 @@ stages:
     - docker info
     - docker login registry.gitlab.com -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
   script:
-    - docker build --tag ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG} containers/${NAME}
+    - docker build --tag ${CI_REGISTRY_IMAGE}/${NAME}:latest containers/${NAME}
     - if test "${CI_PIPELINE_SOURCE}" = "push" &&
          test "${CI_COMMIT_REF_NAME}" = "${CI_DEFAULT_BRANCH}";
       then
-          docker push ${CI_REGISTRY_IMAGE}/${NAME}:${CI_COMMIT_REF_SLUG};
+          docker push ${CI_REGISTRY_IMAGE}/${NAME}:latest;
       fi
   after_script:
     - docker logout
diff --git a/containers/black/README.rst b/containers/black/README.rst
index 2de2d0d6..61d6d20d 100644
--- a/containers/black/README.rst
+++ b/containers/black/README.rst
@@ -18,7 +18,7 @@ or adding the following snippet to ``.gitlab-ci.yml``
 
    black:
      stage: sanity_checks
-     image: registry.gitlab.com/libvirt/libvirt-ci/black:master
+     image: registry.gitlab.com/libvirt/libvirt-ci/black:latest
      needs: []
      script:
        - /black
diff --git a/containers/cargo-fmt/README.rst b/containers/cargo-fmt/README.rst
index 9bffeb16..c2ca8020 100644
--- a/containers/cargo-fmt/README.rst
+++ b/containers/cargo-fmt/README.rst
@@ -18,7 +18,7 @@ or adding the following snippet to ``.gitlab-ci.yml``
 
    cargo-fmt:
      stage: sanity_checks
-     image: registry.gitlab.com/libvirt/libvirt-ci/cargo-fmt:master
+     image: registry.gitlab.com/libvirt/libvirt-ci/cargo-fmt:latest
      needs: []
      script:
        - /cargo-fmt
diff --git a/containers/clang-format/README.rst b/containers/clang-format/README.rst
index 8f20ddb9..88daf17b 100644
--- a/containers/clang-format/README.rst
+++ b/containers/clang-format/README.rst
@@ -18,7 +18,7 @@ or adding the following snippet to ``.gitlab-ci.yml``
 
    clang-format:
      stage: sanity_checks
-     image: registry.gitlab.com/libvirt/libvirt-ci/clang-format:master
+     image: registry.gitlab.com/libvirt/libvirt-ci/clang-format:latest
      needs: []
      script:
        - /clang-format
diff --git a/containers/flake8/README.rst b/containers/flake8/README.rst
index d4b4461c..22a62567 100644
--- a/containers/flake8/README.rst
+++ b/containers/flake8/README.rst
@@ -18,7 +18,7 @@ or adding the following snippet to ``.gitlab-ci.yml``
 
    flake8:
      stage: sanity_checks
-     image: registry.gitlab.com/libvirt/libvirt-ci/flake8:master
+     image: registry.gitlab.com/libvirt/libvirt-ci/flake8:latest
      needs: []
      script:
        - /flake8
diff --git a/containers/go-fmt/README.rst b/containers/go-fmt/README.rst
index 0af69981..132c776b 100644
--- a/containers/go-fmt/README.rst
+++ b/containers/go-fmt/README.rst
@@ -10,7 +10,7 @@ the following snippet to ``.gitlab-ci.yml``
 
    go-fmt:
      stage: prebuild
-     image: registry.gitlab.com/libvirt/libvirt-ci/go-fmt:master
+     image: registry.gitlab.com/libvirt/libvirt-ci/go-fmt:latest
      script:
        - /go-fmt
      artifacts:
diff --git a/lcitool/gitlab.py b/lcitool/gitlab.py
index ccc0b540..1b34572b 100644
--- a/lcitool/gitlab.py
+++ b/lcitool/gitlab.py
@@ -306,7 +306,7 @@ def cirrus_template(cidir):
         f"""
         .cirrus_build_job:
           stage: builds
-          image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
+          image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest
           interruptible: true
           needs: []
           script:
@@ -371,7 +371,7 @@ def check_dco_job():
         check-dco:
           stage: sanity_checks
           needs: []
-          image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
+          image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:latest
           interruptible: true
           script:
             - /check-dco "$RUN_UPSTREAM_NAMESPACE"
@@ -394,7 +394,7 @@ def code_fmt_template():
         """
         .code_format:
           stage: sanity_checks
-          image: registry.gitlab.com/libvirt/libvirt-ci/$NAME:master
+          image: registry.gitlab.com/libvirt/libvirt-ci/$NAME:latest
           interruptible: true
           needs: []
           script:
diff --git a/tests/data/manifest/out/ci/gitlab/build-templates.yml b/tests/data/manifest/out/ci/gitlab/build-templates.yml
index 5d6d0088..377c0559 100644
--- a/tests/data/manifest/out/ci/gitlab/build-templates.yml
+++ b/tests/data/manifest/out/ci/gitlab/build-templates.yml
@@ -228,7 +228,7 @@
 
 .cirrus_build_job:
   stage: builds
-  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
+  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest
   interruptible: true
   needs: []
   script:
diff --git a/tests/data/manifest/out/ci/gitlab/sanity-checks.yml b/tests/data/manifest/out/ci/gitlab/sanity-checks.yml
index 00edbce0..b26d4b12 100644
--- a/tests/data/manifest/out/ci/gitlab/sanity-checks.yml
+++ b/tests/data/manifest/out/ci/gitlab/sanity-checks.yml
@@ -1,7 +1,7 @@
 check-dco:
   stage: sanity_checks
   needs: []
-  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
+  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:latest
   interruptible: true
   script:
     - /check-dco "$RUN_UPSTREAM_NAMESPACE"
@@ -22,7 +22,7 @@ check-dco:
 
 .code_format:
   stage: sanity_checks
-  image: registry.gitlab.com/libvirt/libvirt-ci/$NAME:master
+  image: registry.gitlab.com/libvirt/libvirt-ci/$NAME:latest
   interruptible: true
   needs: []
   script: