diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml
index 21ee68c92c..2f5845eb74 100644
--- a/jenkins/jobs/kolla.yaml
+++ b/jenkins/jobs/kolla.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}'
+    name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}'
     node: '{node}'
 
     wrappers:
@@ -14,7 +14,7 @@
       - shell: |
           #!/bin/bash -xe
           tests/setup_gate.sh
-          tox -e {action}-images-{distro}-{type}
+          tox -e {action}-{distro}-{type}
 
     publishers:
       - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5cb8b3fd1a..5e2d5c0ab1 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2228,43 +2228,43 @@
       - openstack-publish-jobs
       - 'gate-{name}-tox-{envlist}':
           envlist: validate-contents
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: centos
           node: 'devstack-centos7'
           pipeline: gate
           type: binary
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: centos
           node: 'devstack-centos7'
           pipeline: gate
           type: binary
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: centos
           node: 'devstack-centos7'
           pipeline: gate
           type: source
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: centos
           node: 'devstack-centos7'
           pipeline: gate
           type: source
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: ubuntu
           node: 'devstack-trusty'
           pipeline: gate
           type: source
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: ubuntu
           node: 'devstack-trusty'
           pipeline: gate
           type: source
-      - '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}':
+      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy-multinode
           distro: ubuntu
           node: 'devstack-trusty-2-node'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0b17c2c9f4..892f776c1e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1781,22 +1781,22 @@ jobs:
   - name: gate-glance_store-python34
     branch: ^(?!stable/kilo).*$
 
-  - name: gate-kolla-dsvm-build-images-centos-binary
+  - name: gate-kolla-dsvm-build-centos-binary
     voting: false
 
-  - name: gate-kolla-dsvm-deploy-images-centos-binary
+  - name: gate-kolla-dsvm-deploy-centos-binary
     voting: false
 
-  - name: gate-kolla-dsvm-build-images-centos-source
+  - name: gate-kolla-dsvm-build-centos-source
     voting: false
 
-  - name: gate-kolla-dsvm-deploy-images-centos-source
+  - name: gate-kolla-dsvm-deploy-centos-source
     voting: false
 
-  - name: gate-kolla-dsvm-build-images-ubuntu-source
+  - name: gate-kolla-dsvm-build-ubuntu-source
     voting: false
 
-  - name: gate-kolla-dsvm-deploy-images-ubuntu-source
+  - name: gate-kolla-dsvm-deploy-ubuntu-source
     voting: false
 
   - name: ^(gate-)?devstack-publish-docs
@@ -5685,18 +5685,18 @@ projects:
       - gate-kolla-bashate
       - gate-kolla-pep8
       - gate-kolla-tox-validate-contents
-      - gate-kolla-dsvm-build-images-centos-binary
-      - gate-kolla-dsvm-deploy-images-centos-binary
-      - gate-kolla-dsvm-build-images-centos-source
-      - gate-kolla-dsvm-deploy-images-centos-source
-      - gate-kolla-dsvm-build-images-ubuntu-source
-      - gate-kolla-dsvm-deploy-images-ubuntu-source
+      - gate-kolla-dsvm-build-centos-binary
+      - gate-kolla-dsvm-deploy-centos-binary
+      - gate-kolla-dsvm-build-centos-source
+      - gate-kolla-dsvm-deploy-centos-source
+      - gate-kolla-dsvm-build-ubuntu-source
+      - gate-kolla-dsvm-deploy-ubuntu-source
     gate:
       - gate-kolla-bashate
       - gate-kolla-pep8
       - gate-kolla-tox-validate-contents
     experimental:
-      - experimental-kolla-dsvm-deploy-multinode-images-ubuntu-source
+      - experimental-kolla-dsvm-deploy-multinode-ubuntu-source
 
   - name: openstack/kolla-mesos
     template:
diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py
index aac648ea09..0e76a0dd8f 100644
--- a/zuul/openstack_functions.py
+++ b/zuul/openstack_functions.py
@@ -99,7 +99,7 @@ def set_node_options(item, job, params, default):
     centos6_re = r'^.*-centos6.*$'
     fedora_re = r'^.*-f(edora-)?2(1|2).*$'
     tripleo_re = r'^.*-tripleo-ci.*$'
-    kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-images-.*$'
+    kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-.*$'
     openstack_ansible_re = r'^.*-openstack-ansible-.*$'
     devstack_re = r'^.*-dsvm.*$'
     puppetunit_re = (