diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5adecd9fb743e348032c2c149222f42ae28bdb34..2881f0d89b0444ce1605ce57dad07a0df454eaf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,14 +54,12 @@ variables:
   GIT_SUBMODULE_DEPTH: 0 # Full clone of the submodules
 
   # Images
-  IMAGE_ANALYSIS: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-ci-analysis:2025-02-11-10282675
-  IMAGE_CPPCHECK: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-cppcheck:2.16.0
-  IMAGE_BUILD: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-ci-build:2025-02-11-10282675
-  IMAGE_TEST: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-ci-test:2025-02-11-10282675
-  IMAGE_RELEASE: gitlab-registry.cern.ch/cta/eoscta-operations/registry/container_registry/cta-ci-release:2025-02-11-10282675
+  IMAGE_ANALYSIS: gitlab-registry.cern.ch/cta/public_registry/container_registry/cta-ci-analysis:2025-02-25-10874611
+  IMAGE_BUILD: gitlab-registry.cern.ch/cta/public_registry/container_registry/cta-ci-build:2025-02-25-10874611
+  IMAGE_TEST: gitlab-registry.cern.ch/cta/public_registry/container_registry/cta-ci-test:2025-02-25-10874611
+  IMAGE_RELEASE: gitlab-registry.cern.ch/cta/public_registry/container_registry/cta-ci-release:2025-02-25-10874611
   IMAGE_GITLAB_RELEASE_CLI: registry.gitlab.com/gitlab-org/release-cli:latest
   IMAGE_DOCKER_IMAGE_BUILDER: gcr.io/kaniko-project/executor:debug
-  # This Python image will eventually be replaced by IMAGE_RELEASE
 
 default:
   interruptible: true
diff --git a/.gitlab/ci/analysis.gitlab-ci.yml b/.gitlab/ci/analysis.gitlab-ci.yml
index db1b815714bb04d3f7accaf63fecdbb18838d53a..c5c981021e0da4017db6dc719016a403ff088f20 100644
--- a/.gitlab/ci/analysis.gitlab-ci.yml
+++ b/.gitlab/ci/analysis.gitlab-ci.yml
@@ -1,7 +1,7 @@
 cppcheck:
   stage: analysis
   image:
-    name: $IMAGE_CPPCHECK
+    name: $IMAGE_ANALYSIS
     entrypoint: ["/usr/bin/env"]
   rules:
     - if: $CI_COMMIT_TAG