diff --git a/roles/run-cover/defaults/main.yaml b/roles/run-cover/defaults/main.yaml
index 2e32efe..31d25c5 100644
--- a/roles/run-cover/defaults/main.yaml
+++ b/roles/run-cover/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-run_cover_envlist: cover
+envlist: cover
diff --git a/roles/run-cover/tasks/main.yaml b/roles/run-cover/tasks/main.yaml
index 09d7e3d..f002857 100644
--- a/roles/run-cover/tasks/main.yaml
+++ b/roles/run-cover/tasks/main.yaml
@@ -1,4 +1,4 @@
 - name: Execute run-cover.sh.
-  shell: "/usr/local/jenkins/slave_scripts/run-cover.sh {{ run_cover_envlist }}"
+  shell: "/usr/local/jenkins/slave_scripts/run-cover.sh {{ envlist }}"
   args:
     chdir: "{{ zuul_workspace_root }}/src/{{ zuul.project.canonical_name }}"
diff --git a/roles/run-docs/defaults/main.yaml b/roles/run-docs/defaults/main.yaml
index 5855a3d..f64d0f1 100644
--- a/roles/run-docs/defaults/main.yaml
+++ b/roles/run-docs/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-run_docs_envlist: venv
+envlist: venv
diff --git a/roles/run-docs/tasks/main.yaml b/roles/run-docs/tasks/main.yaml
index dec9260..ae828a6 100644
--- a/roles/run-docs/tasks/main.yaml
+++ b/roles/run-docs/tasks/main.yaml
@@ -1,4 +1,4 @@
 - name: Execute run-docs.sh.
-  shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {{ run_docs_envlist }}"
+  shell: "/usr/local/jenkins/slave_scripts/run-docs.sh {{ envlist }}"
   args:
     chdir: "{{ zuul_workspace_root }}/src/{{ zuul.project.canonical_name }}"
diff --git a/roles/run-tarball/defaults/main.yaml b/roles/run-tarball/defaults/main.yaml
index 072828a..f64d0f1 100644
--- a/roles/run-tarball/defaults/main.yaml
+++ b/roles/run-tarball/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-run_tarball_envlist: venv
+envlist: venv
diff --git a/roles/run-tarball/tasks/main.yaml b/roles/run-tarball/tasks/main.yaml
index 66250c3..6667981 100644
--- a/roles/run-tarball/tasks/main.yaml
+++ b/roles/run-tarball/tasks/main.yaml
@@ -1,4 +1,4 @@
 - name: Execute run-tarball.sh.
-  shell: "/usr/local/jenkins/slave_scripts/run-tarball.sh {{ run_tarball_envlist }}"
+  shell: "/usr/local/jenkins/slave_scripts/run-tarball.sh {{ envlist }}"
   args:
     chdir: "{{ zuul_workspace_root }}/src/{{ zuul.project.canonical_name }}"
diff --git a/roles/run-tox/defaults/main.yaml b/roles/run-tox/defaults/main.yaml
index 9cb1477..18af828 100644
--- a/roles/run-tox/defaults/main.yaml
+++ b/roles/run-tox/defaults/main.yaml
@@ -1,2 +1,4 @@
 ---
+# TODO(pabelanger): Remove in the following comment to unwedge gate.
 run_tox_envlist:
+envlist: "{{ run_tox_envlist }}"
diff --git a/roles/run-tox/tasks/main.yaml b/roles/run-tox/tasks/main.yaml
index 297caba..2b3066f 100644
--- a/roles/run-tox/tasks/main.yaml
+++ b/roles/run-tox/tasks/main.yaml
@@ -1,4 +1,4 @@
 - name: Run tox
-  shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {{ run_tox_envlist }}"
+  shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {{ envlist }}"
   args:
     chdir: "{{ zuul_workspace_root }}/src/{{ zuul.project.canonical_name }}"
diff --git a/roles/run-wheel/defaults/main.yaml b/roles/run-wheel/defaults/main.yaml
index 8645d33..f64d0f1 100644
--- a/roles/run-wheel/defaults/main.yaml
+++ b/roles/run-wheel/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-run_wheel_envlist: venv
+envlist: venv
diff --git a/roles/run-wheel/tasks/main.yaml b/roles/run-wheel/tasks/main.yaml
index d0306b9..0b6f518 100644
--- a/roles/run-wheel/tasks/main.yaml
+++ b/roles/run-wheel/tasks/main.yaml
@@ -1,4 +1,4 @@
 - name: Execute run-wheel.sh.
-  shell: "/usr/local/jenkins/slave_scripts/run-wheel.sh {{ run_wheel_envlist }}"
+  shell: "/usr/local/jenkins/slave_scripts/run-wheel.sh {{ envlist }}"
   args:
     chdir: "{{ zuul_workspace_root }}/src/{{ zuul.project.canonical_name }}"