diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml
index cc173fcb9f..b4694da969 100644
--- a/jenkins/jobs/nodepool.yaml
+++ b/jenkins/jobs/nodepool.yaml
@@ -96,23 +96,31 @@
 
           if [ "{images}" == "-redhat" ] ; then
               export NODEPOOL_PAUSE_CENTOS_7_DIB=false
+              # TODO(pabelanger): Remove fedora-24 once deleted from
+              # nodepool.yaml.
               export NODEPOOL_PAUSE_FEDORA_24_DIB=false
+              export NODEPOOL_PAUSE_FEDORA_25_DIB=false
               export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=true
               export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=true
               export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=true
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=$NODEPOOL_PAUSE_FEDORA_24_DIB"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=$NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB"
           elif [ "{images}" == "-debian" ] ; then
               export NODEPOOL_PAUSE_CENTOS_7_DIB=true
+              # TODO(pabelanger): Remove fedora-24 once deleted from
+              # nodepool.yaml.
               export NODEPOOL_PAUSE_FEDORA_24_DIB=true
+              export NODEPOOL_PAUSE_FEDORA_25_DIB=true
               export NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=false
               export NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=false
               export NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=false
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_CENTOS_7_DIB=$NODEPOOL_PAUSE_CENTOS_7_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_24_DIB=$NODEPOOL_PAUSE_FEDORA_24_DIB"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_FEDORA_25_DIB=$NODEPOOL_PAUSE_FEDORA_25_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB=$NODEPOOL_PAUSE_UBUNTU_PRECISE_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB=$NODEPOOL_PAUSE_UBUNTU_TRUSTY_DIB"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB=$NODEPOOL_PAUSE_UBUNTU_XENIAL_DIB"