diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index 6f01ec970ba2a11090f583a4a72070d3a5768d92..4033a43b8e04be6f9671c0920a34fd77a6be1d15 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -326,14 +326,14 @@ variables:
   DOCKER_TRIVY_DISABLED: $[[ inputs.trivy-disabled ]]
   DOCKER_TRIVY_ADDR: $[[ inputs.trivy-addr ]]
   DOCKER_SBOM_DISABLED: $[[ inputs.sbom-disabled ]]
-  DOCKER_HADOLINT_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_KANIKO_BUILD_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_DIND_BUILD_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_BUILDAH_BUILD_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_HEALTHCHECK_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_DOCKER_TRIVY_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_DOCKER_SBOM_JOB_TAGS: "Added for legacy lint and validation support with arrays"
-  DOCKER_DOCKER_PUBLISH_JOB_TAGS: "Added for legacy lint and validation support with arrays"
+  DOCKER_HADOLINT_JOB_TAGS: "$[[ inputs.hadolint-job-tags ]]"
+  DOCKER_KANIKO_BUILD_JOB_TAGS: "$[[ inputs.kaniko-build-job-tags ]]"
+  DOCKER_DIND_BUILD_JOB_TAGS: "$[[ inputs.dind-build-job-tags ]]"
+  DOCKER_BUILDAH_BUILD_JOB_TAGS: "$[[ inputs.buildah-build-job-tags ]]"
+  DOCKER_HEALTHCHECK_JOB_TAGS: "$[[ inputs.healthcheck-job-tags ]]"
+  DOCKER_DOCKER_TRIVY_JOB_TAGS: "$[[ inputs.docker-trivy-job-tags ]]"
+  DOCKER_DOCKER_SBOM_JOB_TAGS: "$[[ inputs.docker-sbom-job-tags ]]"
+  DOCKER_DOCKER_PUBLISH_JOB_TAGS: "$[[ inputs.docker-publish-job-tags ]]"
 
 # ==================================================
 # Stages definition