diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index dc10456787..2e2f2e2b16 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -178,6 +178,23 @@ labels:
       - name: osic-cloud1-disk
       - name: infracloud-vanilla
       - name: infracloud-chocolate
+  - name: fedora-25
+    image: fedora-25
+    ready-script: configure_mirror.sh
+    min-ready: 1
+    providers:
+      - name: rax-dfw
+      - name: rax-ord
+      - name: rax-iad
+      - name: ovh-gra1
+      - name: ovh-bhs1
+      - name: bluebox-sjc1
+      - name: internap-mtl01
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
+      - name: infracloud-vanilla
+      - name: infracloud-chocolate
   - name: centos-7-2-node
     image: centos-7
     ready-script: multinode_setup.sh
@@ -285,6 +302,13 @@ providers:
         private-key: /home/nodepool/.ssh/id_rsa
         name-filter: 'Performance'
         config-drive: true
+      - name: fedora-25
+        min-ram: 8192
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
+        config-drive: true
       - name: centos-7
         min-ram: 8192
         diskimage: centos-7
@@ -338,6 +362,13 @@ providers:
         private-key: /home/nodepool/.ssh/id_rsa
         name-filter: 'Performance'
         config-drive: true
+      - name: fedora-25
+        min-ram: 8192
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
+        config-drive: true
       - name: centos-7
         min-ram: 8192
         diskimage: centos-7
@@ -391,6 +422,13 @@ providers:
         private-key: /home/nodepool/.ssh/id_rsa
         name-filter: 'Performance'
         config-drive: true
+      - name: fedora-25
+        min-ram: 8192
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        name-filter: 'Performance'
+        config-drive: true
       - name: centos-7
         min-ram: 8192
         diskimage: centos-7
@@ -442,6 +480,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'ssd-osFoundation-3'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -493,6 +538,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'ssd-osFoundation-3'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -544,6 +596,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'nodepool'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'nodepool'
@@ -594,6 +653,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'A1.8'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'A1.8'
@@ -647,6 +713,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'm2.medium.s3500'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'm2.medium.s3500'
@@ -700,6 +773,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'm2.medium.s3700'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'm2.medium.s3700'
@@ -753,6 +833,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'm2.medium.disk'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'm2.medium.disk'
@@ -838,6 +925,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'nodepool'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'nodepool'
@@ -889,6 +983,13 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: fedora-25
+        min-ram: 8000
+        name-filter: 'nodepool'
+        diskimage: fedora-25
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: centos-7
         min-ram: 8000
         name-filter: 'nodepool'