diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 06716703a7c4dd164f845f184631bfd057979146..7b039668a0c6ef4cba1b86123dcf69b67be31849 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -24,6 +24,10 @@ variables:
   FETCH_PUBLIC_MR_NUMBER:
     description: "MR number to fetch"
 
+  DOCKER_IMAGE_TAG:
+    description: "Docker Tag to use for this pipeline"
+    value: "latest"
+
 default:
   tags:
     - arm64
diff --git a/.gitlab/templates/beetle-security-test.yml b/.gitlab/templates/beetle-security-test.yml
index e769320480134bfd3b008c0509ed30014c6d43e1..cf1b5b6cca1410b88e28f39d77bea223a548f03b 100644
--- a/.gitlab/templates/beetle-security-test.yml
+++ b/.gitlab/templates/beetle-security-test.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .beetle-security-test:
-  image: ${CI_REGISTRY_IMAGE}/scp-tester-amd64
+  image: ${CI_REGISTRY_IMAGE}/scp-tester-amd64:${DOCKER_IMAGE_TAG}
   tags:
     - amd64
   variables:
diff --git a/.gitlab/templates/blackduck_scanner.yml b/.gitlab/templates/blackduck_scanner.yml
index f4ec1a65ea92b1e33a469ee1dece8a588057c916..aead7d423118bb2f9f161b63545da3505e3d47e9 100644
--- a/.gitlab/templates/blackduck_scanner.yml
+++ b/.gitlab/templates/blackduck_scanner.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .blackduck-scan:
-  image: ${CI_REGISTRY_IMAGE}/blackduck-scanner-amd64
+  image: ${CI_REGISTRY_IMAGE}/blackduck-scanner-amd64:${DOCKER_IMAGE_TAG}
   tags:
     - amd64
   variables:
diff --git a/.gitlab/templates/build-test.yml b/.gitlab/templates/build-test.yml
index 2b7e54e9fbefa96f25de5ceffdcc28c057fe1e83..5c27a591a6e5afb466ff997dec7456d0faae16f4 100644
--- a/.gitlab/templates/build-test.yml
+++ b/.gitlab/templates/build-test.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .build-products:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_DEPTH: 1
@@ -51,7 +51,7 @@
           [DEBUG, INFO, WARN, ERROR, CRIT, DISABLED]
 
 .build-optee:
-  image: ${CI_REGISTRY_IMAGE}/optee-build:latest
+  image: ${CI_REGISTRY_IMAGE}/optee-build:${DOCKER_IMAGE_TAG}
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_DEPTH: 1
diff --git a/.gitlab/templates/linting.yml b/.gitlab/templates/linting.yml
index b154fc04d52e3172d6bbc88d0897ffe50f82018e..e7d8f97dafc62c741fa8e37a5b937149f6ffe5f8 100644
--- a/.gitlab/templates/linting.yml
+++ b/.gitlab/templates/linting.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .check-lint:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - python3 tools/${CHECK_SCRIPT}.py
   parallel:
@@ -18,12 +18,12 @@
         - check_tabs
 
 .check-copyright:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - python3 tools/check_copyright.py -c "${CI_MERGE_REQUEST_DIFF_BASE_SHA}"
 
 .check-style:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - python3 tools/check_style.py -c "${CI_MERGE_REQUEST_DIFF_BASE_SHA}"
   artifacts:
@@ -33,7 +33,7 @@
       - code-style.patch
 
 .check-for-merge-commits:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - |
       merge_count=$(git log --merges --oneline \
diff --git a/.gitlab/templates/merge-report.yml b/.gitlab/templates/merge-report.yml
index 66e21eec9432fd0a81e4f766c2dd9de8d686ca6b..88d8bba1e744f750e6c45a7811c31d09323a0afc 100644
--- a/.gitlab/templates/merge-report.yml
+++ b/.gitlab/templates/merge-report.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .merge-report:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   before_script:
     - rm -rf artifacts/coverage_reports/merge_report
     - mkdir -p artifacts/coverage_reports/merge_report
diff --git a/.gitlab/templates/platform-test.yml b/.gitlab/templates/platform-test.yml
index 11bce63ee745d23808819165714a6834d65ae485..7f984a8d2d69270b8dcd773d16c7ac21318bdd9d 100644
--- a/.gitlab/templates/platform-test.yml
+++ b/.gitlab/templates/platform-test.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .platform-test:
-  image: ${CI_REGISTRY_IMAGE}/plat-test-amd64
+  image: ${CI_REGISTRY_IMAGE}/plat-test-amd64:${DOCKER_IMAGE_TAG}
   tags:
     - amd64
   variables:
diff --git a/.gitlab/templates/scmi-test.yml b/.gitlab/templates/scmi-test.yml
index 783fc36d27656e3f5ee808dd182b609dd28ac511..01bc2372846f570873b4267a868a57a020a1b268 100644
--- a/.gitlab/templates/scmi-test.yml
+++ b/.gitlab/templates/scmi-test.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .scmi-test:
-  image: ${CI_REGISTRY_IMAGE}/scp-tester-amd64
+  image: ${CI_REGISTRY_IMAGE}/scp-tester-amd64:${DOCKER_IMAGE_TAG}
   tags:
     - amd64
   variables:
diff --git a/.gitlab/templates/setup-workspace.yml b/.gitlab/templates/setup-workspace.yml
index 146ba07c31154924c9832a6639671af5c8c80f2a..9e3b08b59eb5647bf8e943d5c43d21ab8992dc09 100644
--- a/.gitlab/templates/setup-workspace.yml
+++ b/.gitlab/templates/setup-workspace.yml
@@ -1,13 +1,13 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 
 .pull-mr:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   variables:
     GIT_STRATEGY: clone
     GIT_CHECKOUT: "false"
diff --git a/.gitlab/templates/static-analysis.yml b/.gitlab/templates/static-analysis.yml
index 48f18aa6b94ea036175d1d05b594f622f5254201..3e4316456ad1a8402466d7a414139c6c8f89f0ce 100644
--- a/.gitlab/templates/static-analysis.yml
+++ b/.gitlab/templates/static-analysis.yml
@@ -1,11 +1,11 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .banned-api:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - python3 tools/check_api.py
diff --git a/.gitlab/templates/status-report.yml b/.gitlab/templates/status-report.yml
index 09ca248033c505b8c81054f7a5fc57b1110c6461..7c994f8f7bf8ed387e05c2e42eccd48e7ccdcbba 100644
--- a/.gitlab/templates/status-report.yml
+++ b/.gitlab/templates/status-report.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .report-status:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - |
       curl --fail --location --request POST \
diff --git a/.gitlab/templates/test-count.yml b/.gitlab/templates/test-count.yml
index 1804837f53aa70ed74b12959343e06c5df4dc3fa..4deef9348cafb2fa009512dc4294f78f22a534d3 100644
--- a/.gitlab/templates/test-count.yml
+++ b/.gitlab/templates/test-count.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .test-count:
-  image: ${CI_REGISTRY_IMAGE}/ci-base
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   script:
     - |
     - /test_count_entrypoint.sh "
diff --git a/.gitlab/templates/unit-test.yml b/.gitlab/templates/unit-test.yml
index 0899eacf99dbca083aba95e7f8b458e3f3e873b3..0e7066d10b71a42421b07a93562d8ad4bedabd9d 100644
--- a/.gitlab/templates/unit-test.yml
+++ b/.gitlab/templates/unit-test.yml
@@ -1,12 +1,12 @@
 #
 # Arm SCP/MCP Software
-# Copyright (c) 2024, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 .check-ut:
-  image: ${CI_REGISTRY_IMAGE}/ci-base:latest
+  image: ${CI_REGISTRY_IMAGE}/ci-base:${DOCKER_IMAGE_TAG}
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_DEPTH: 1