diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index b09aa8c1efd38afc3c0cf00a092bb5e15f9e9ad2..c197c998cd491157158c689737b05870ce7c5019 100644
--- a/templates/gitlab-ci-docker-ecr.yml
+++ b/templates/gitlab-ci-docker-ecr.yml
@@ -2,14 +2,14 @@
 # === AWS Auth template variant
 # =====================================================================================================================
 variables:
-  TBC_AWS_AUTH_PROVIDER: "$CI_REGISTRY/to-be-continuous/tools/aws-auth-provider:master"
+  TBC_AWS_PROVIDER_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/aws-auth-provider:master"
   AWS_OIDC_AUD: "$CI_SERVER_URL"
 
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
       command: ["--service", "docker", "5.5.4"]
-    - name: "$TBC_AWS_AUTH_PROVIDER"
+    - name: "$TBC_AWS_PROVIDER_IMAGE"
       alias: "aws-auth-provider"
   id_tokens:
     # required for OIDC auth
diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml
index 28d35281b12f1d48f6b1f5e0457e260425e24a20..fec1b5733b0d54b51e7b6041d5070382bf715908 100644
--- a/templates/gitlab-ci-docker-gcp.yml
+++ b/templates/gitlab-ci-docker-gcp.yml
@@ -2,14 +2,14 @@
 # === GCP Auth template variant
 # =====================================================================================================================
 variables:
-  TBC_GCP_AUTH_PROVIDER: "$CI_REGISTRY/to-be-continuous/tools/gcp-auth-provider:main"
+  TBC_GCP_PROVIDER_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/gcp-auth-provider:main"
   GCP_OIDC_AUD: "$CI_SERVER_URL"
 
 .docker-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
       command: ["--service", "docker", "5.5.4"]
-    - name: "$TBC_GCP_AUTH_PROVIDER"
+    - name: "$TBC_GCP_PROVIDER_IMAGE"
       alias: "gcp-auth-provider"
   variables:
     #  have to be explicitly declared in the YAML to be exported to the service