diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml
index 75e362566a..839f97fbf5 100644
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@@ -117,8 +117,8 @@
     suffix: ''
     node:
       - centos-7
+      - fedora-24
       - debian-jessie
-      - fedora-23
       - ubuntu-precise
       - ubuntu-trusty
       - ubuntu-xenial
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 58ab4a0d61..56403e8b70 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -385,7 +385,7 @@
           suffix: '-nv'
       - 'gate-barbican-{plugin}-devstack{special}-{node}{suffix}':
           plugin: dogtag
-          node: fedora-23
+          node: fedora-24
           services: barbican-dogtag,tempest,keystone
           special: ''
           suffix: '-nv'
@@ -13941,11 +13941,6 @@
           pipeline: gate
           suffix: '-nv'
           branch-override: default
-      - '{pipeline}-scalpels-dsvm-neutron-{node}{suffix}':
-          node: 'fedora-23'
-          pipeline: gate
-          suffix: '-nv'
-          branch-override: default
 
 - project:
     name: searchlight
@@ -14640,7 +14635,6 @@
             - ubuntu-precise
             - ubuntu-trusty
             - ubuntu-xenial
-            - fedora-23
             - fedora-24
       - infra-publish-jobs
       - 'gate-{name}-docs-{node}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5039ffc61a..2d45d41faa 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -324,15 +324,15 @@ project-templates:
   - name: bindep-fallback
     check:
       - gate-{name}-bindep-fallback-centos-7
+      - gate-{name}-bindep-fallback-fedora-24
       - gate-{name}-bindep-fallback-debian-jessie
-      - gate-{name}-bindep-fallback-fedora-23
       - gate-{name}-bindep-fallback-ubuntu-precise
       - gate-{name}-bindep-fallback-ubuntu-trusty
       - gate-{name}-bindep-fallback-ubuntu-xenial
     gate:
       - gate-{name}-bindep-fallback-centos-7
+      - gate-{name}-bindep-fallback-fedora-24
       - gate-{name}-bindep-fallback-debian-jessie
-      - gate-{name}-bindep-fallback-fedora-23
       - gate-{name}-bindep-fallback-ubuntu-precise
       - gate-{name}-bindep-fallback-ubuntu-trusty
       - gate-{name}-bindep-fallback-ubuntu-xenial
@@ -1020,7 +1020,6 @@ project-templates:
       - gate-infra-puppet-apply-3-ubuntu-precise
       - gate-infra-puppet-apply-3-ubuntu-trusty
       - gate-infra-puppet-apply-3-ubuntu-xenial
-      - gate-infra-puppet-apply-3-fedora-23
       - gate-infra-puppet-apply-3-fedora-24
       - gate-openstackci-beaker-centos-7
       - gate-openstackci-beaker-ubuntu-trusty
@@ -1031,7 +1030,6 @@ project-templates:
       - gate-infra-puppet-apply-3-ubuntu-precise
       - gate-infra-puppet-apply-3-ubuntu-trusty
       - gate-infra-puppet-apply-3-ubuntu-xenial
-      - gate-infra-puppet-apply-3-fedora-23
       - gate-infra-puppet-apply-3-fedora-24
       - gate-openstackci-beaker-centos-7
       - gate-openstackci-beaker-ubuntu-trusty
@@ -5443,7 +5441,7 @@ projects:
       - barbican-coverage-ubuntu-xenial
       - gate-barbican-simple-crypto-devstack-ubuntu-trusty
       - gate-barbican-simple-crypto-devstack-ubuntu-xenial
-      - gate-barbican-dogtag-devstack-fedora-23-nv
+      - gate-barbican-dogtag-devstack-fedora-24-nv
       - gate-barbican-simple-crypto-devstack-postgres-ubuntu-trusty-nv
       - gate-barbican-simple-crypto-devstack-postgres-ubuntu-xenial-nv
     gate:
@@ -16489,7 +16487,6 @@ projects:
       - name: publish-to-pypi
     experimental:
       - gate-scalpels-dsvm-neutron-ubuntu-xenial-nv
-      - gate-scalpels-dsvm-neutron-fedora-23-nv
 
   - name: openstack/searchlight
     template: