diff --git a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2 b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
index 8e80e8099f1..dedff0e44bd 100644
--- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
+++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
@@ -2,7 +2,7 @@ version: 1
 
 # Rules to match for a machine to qualify
 target:
-  id: '{{ ci_runner_id }}'
+  id: '{{ ci_runner_description }}'
 
 timeouts:
 
diff --git a/.gitlab-ci/b2c/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py
index 7c20feb17b1..fea12dcf192 100755
--- a/.gitlab-ci/b2c/generate_b2c.py
+++ b/.gitlab-ci/b2c/generate_b2c.py
@@ -37,7 +37,7 @@ env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])),
 template = env.get_template(path.basename(values['job_template']))
 
 values['ci_job_id'] = environ['CI_JOB_ID']
-values['ci_runner_id'] = environ['CI_RUNNER_ID']
+values['ci_runner_description'] = environ['CI_RUNNER_DESCRIPTION']
 values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl]
 values['working_dir'] = environ['CI_PROJECT_DIR']