diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml
index 6665d8c4e1..3a5e2673c8 100644
--- a/jenkins/jobs/kolla.yaml
+++ b/jenkins/jobs/kolla.yaml
@@ -57,6 +57,71 @@
               target: 'tarballs/kolla/images/'
       - console-log
 
+- job-template:
+    name: 'publish-kolla-dsvm-{action}-{distro}-{type}-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 90
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - zuul-git-prep-upper-constraints
+      - install-distro-packages
+      - shell: |
+          #!/bin/bash -xe
+          export ACTION={action}
+          export BASE_DISTRO={distro}
+          export INSTALL_TYPE={type}
+          export PACK_REGISTRY=1
+          export PUBLISHER=1
+
+          tools/publisher.sh
+
+    publishers:
+      - devstack-logs
+      - scp:
+          site: 'tarballs.openstack.org'
+          files:
+            - source: 'images/*'
+              target: 'tarballs/kolla/images/tmp'
+      - console-log
+
+- job-template:
+    name: '{pipeline}-kolla-dsvm-{orch}-{action}-{distro}-{type}-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 90
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - zuul-git-prep-upper-constraints
+      - install-distro-packages
+      - shell: |
+          #!/bin/bash -xe
+          export ORCH_ENGINE={orch}
+          export ACTION={action}
+          export BASE_DISTRO={distro}
+          export INSTALL_TYPE={type}
+
+          tools/publisher.sh
+
+    publishers:
+      - devstack-logs
+      - scp:
+          site: 'tarballs.openstack.org'
+          files:
+            - source: 'images/*.txt'
+              target: 'tarballs/kolla/images/tmp'
+      - console-log
+
 - job-group:
     name: 'kolla-publish-image-jobs'
     suffix: ''
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a9e5e14865..f258250901 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6276,15 +6276,7 @@
             - source
           suffix: "-nv"
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{suffix}':
-          action: deploy-multinode
-          distro: ubuntu
-          node: ubuntu-trusty-2-node
-          pipeline: gate
-          type: source
-          suffix: "-nv"
-      - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{suffix}':
-          action:
-            - build
+          action: build
           distro:
             - centos
             - oraclelinux
@@ -6297,15 +6289,40 @@
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}-{node}{suffix}':
           action:
             - build
+            - save
           distro: ubuntu
           node:
-            - ubuntu-trusty
             - ubuntu-xenial
           pipeline: gate
           type:
             - binary
             - source
           suffix: ''
+      - 'publish-kolla-dsvm-{action}-{distro}-{type}-{node}{suffix}':
+          action:
+            - build
+            - save
+          distro: ubuntu
+          node:
+            - ubuntu-xenial
+          type:
+            - binary
+            - source
+          suffix: ''
+      - '{pipeline}-kolla-dsvm-{orch}-{action}-{distro}-{type}-{node}{suffix}':
+          action:
+            - build
+            - deploy-multinode
+          distro: ubuntu
+          orch:
+            - ansible
+            - kubernetes
+          node: ubuntu-xenial-2-node
+          pipeline: publish
+          type:
+            - binary
+            - source
+          suffix: ''
 
 - project:
     name: kolla-ansible
@@ -6347,7 +6364,9 @@
             - source
           suffix: "-nv"
       - '{pipeline}-kolla-ansible-dsvm-{action}-{distro}-{type}-{node}{suffix}':
-          action: deploy-multinode
+          action:
+            - deploy-multinode
+            - upgrade-multinode
           distro:
             - centos
             - oraclelinux
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7d3c7b5ee6..e048464650 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -11363,10 +11363,6 @@ projects:
       - gate-kolla-dsvm-deploy-centos-binary-centos-7-nv
       - gate-kolla-dsvm-build-centos-source-centos-7
       - gate-kolla-dsvm-deploy-centos-source-centos-7-nv
-      - gate-kolla-dsvm-build-ubuntu-binary-ubuntu-trusty-nv
-      - gate-kolla-dsvm-build-ubuntu-source-ubuntu-trusty-nv
-      - gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-trusty-nv
-      - gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-trusty-nv
       - gate-kolla-dsvm-build-ubuntu-binary-ubuntu-xenial-nv
       - gate-kolla-dsvm-build-ubuntu-source-ubuntu-xenial
       - gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv
@@ -11381,7 +11377,10 @@ projects:
       - gate-kolla-dsvm-build-ubuntu-source-ubuntu-xenial
       - gate-kolla-dsvm-build-oraclelinux-source-centos-7
     experimental:
-      - gate-kolla-dsvm-deploy-multinode-ubuntu-source-ubuntu-trusty-2-node-nv
+      - publish-kolla-dsvm-build-ubuntu-source-ubuntu-xenial:
+        - publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node:
+          - publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node:
+            - publish-kolla-dsvm-save-ubuntu-source-ubuntu-xenial
     post:
       - kolla-dsvm-build-centos-binary-centos-7
       - kolla-dsvm-build-centos-source-centos-7
@@ -11407,7 +11406,6 @@ projects:
       - gate-kolla-ansible-dsvm-deploy-ubuntu-source-ubuntu-xenial-nv
       - gate-kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7-nv
       - gate-kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7-nv
-    experimental:
       - gate-kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node-nv
       - gate-kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node-nv
       - gate-kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node-nv
@@ -11420,6 +11418,8 @@ projects:
       - gate-kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node-nv
       - gate-kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node-nv
       - gate-kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node-nv
+    experimental:
+      - gate-kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node-nv
 
   - name: openstack/kolla-kubernetes
     template: