diff --git a/jenkins/jobs/windmill.yaml b/jenkins/jobs/windmill.yaml
index 5f742b6267..78e19cb76c 100644
--- a/jenkins/jobs/windmill.yaml
+++ b/jenkins/jobs/windmill.yaml
@@ -65,20 +65,17 @@
           ostype:
             - centos-7
             - fedora-25
-            - ubuntu-trusty
             - ubuntu-xenial
           pipeline: gate
           scenario:
             - deploy
       - '{pipeline}-windmill-{scenario}-{ostype}{suffix}':
           suffix: ''
-          ostype:
-            - ubuntu-trusty
-            - ubuntu-xenial
+          ostype: ubuntu-xenial
           pipeline: gate
           scenario:
             - buildimages
             - deploy
       - 'windmill-publishimages-{ostype}{suffix}':
           suffix: ''
-          ostype: ubuntu-trusty
+          ostype: ubuntu-xenial
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b5896b7418..994dda5b7a 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1170,11 +1170,11 @@ project-templates:
     gate:
       - 'gate-{name}-nodejs6-npm-docs'
 
-  - name: windmill-buildimages-trusty
+  - name: windmill-buildimages-xenial
     check:
-      - 'gate-windmill-buildimages-ubuntu-trusty'
+      - 'gate-windmill-buildimages-ubuntu-xenial'
     gate:
-      - 'gate-windmill-buildimages-ubuntu-trusty'
+      - 'gate-windmill-buildimages-ubuntu-xenial'
 
   - name: windmill-jobs-centos7-nv
     check:
@@ -1184,16 +1184,6 @@ project-templates:
     check:
       - 'gate-windmill-deploy-fedora-25-nv'
 
-  - name: windmill-jobs-trusty
-    check:
-      - 'gate-windmill-deploy-ubuntu-trusty'
-    gate:
-      - 'gate-windmill-deploy-ubuntu-trusty'
-
-  - name: windmill-jobs-trusty-nv
-    check:
-      - 'gate-windmill-deploy-ubuntu-trusty-nv'
-
   - name: windmill-jobs-xenial
     check:
       - 'gate-windmill-deploy-ubuntu-xenial'
@@ -3668,12 +3658,6 @@ jobs:
   - name: ^gate-(?!openstack-ansible).*(-dsvm)?-ansible-func-ubuntu-trusty(-nv)?$
     branch: master
 
-  - name: ^gate-windmill-(buildimages|deploy)-ubuntu-trusty(-nv)?$
-    branch: master
-
-  - name: windmill-publishimages-ubuntu-trusty
-    branch: master
-
   - name: ^gate-fuel-octane-puppet.*$
     branch: ^(?!stable/(6.[01]|[78].0)).*$
 
@@ -5565,7 +5549,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty-nv
 
   - name: openstack/ansible-role-cloud-launcher
     template:
@@ -5585,7 +5568,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-fedmsg
@@ -5598,7 +5580,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-jenkins
@@ -5620,7 +5601,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty-nv
       - name: windmill-jobs-xenial-nv
 
   - name: openstack/ansible-role-jenkins-plugins
@@ -5641,7 +5621,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial-nv
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty-nv
       - name: windmill-jobs-xenial-nv
 
   - name: openstack/ansible-role-nodepool
@@ -5654,7 +5633,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-shade
@@ -5667,7 +5645,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-ssh
@@ -5680,7 +5657,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-sudoers
@@ -5693,7 +5669,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-virtualenv
@@ -5706,7 +5681,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-zookeeper
@@ -5719,7 +5693,6 @@ projects:
       - name: ansible-role-functional-jobs-xenial
       - name: docs-on-rtfd
       - name: windmill-jobs-centos7-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
 
   - name: openstack/ansible-role-zuul
@@ -18975,13 +18948,10 @@ projects:
       - name: merge-check
       - name: ansible-role-jobs
       - name: docs-on-rtfd
-      - name: windmill-buildimages-trusty
+      - name: windmill-buildimages-xenial
       - name: windmill-jobs-centos7-nv
       - name: windmill-jobs-fedora-25-nv
-      - name: windmill-jobs-trusty
       - name: windmill-jobs-xenial
-    periodic:
-      - windmill-publishimages-ubuntu-trusty
 
   - name: openstack/workload-ref-archs
     template: