diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index f3e6654cf7..f9b9320934 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -337,6 +337,14 @@ providers:
         setup: prepare_node_tripleo.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
+    images:
+      - name: tripleo-f20
+        base-image: 'Fedora 20 64-bit'
+        min-ram: 16384
+        name-filter: h1
+        setup: prepare_node_tripleo.sh
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
 
 
 targets:
@@ -392,6 +400,10 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins02
     jenkins:
       url: 'https://jenkins02.openstack.org/'
@@ -444,6 +456,10 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins03
     jenkins:
       url: 'https://jenkins03.openstack.org/'
@@ -496,6 +512,10 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins04
     jenkins:
       url: 'https://jenkins04.openstack.org/'
@@ -548,6 +568,10 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins05
     jenkins:
       url: 'https://jenkins05.openstack.org/'
@@ -600,6 +624,10 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins06
     jenkins:
       url: 'https://jenkins06.openstack.org/'
@@ -652,6 +680,10 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud
   - name: jenkins07
     jenkins:
       url: 'https://jenkins07.openstack.org/'
@@ -708,3 +740,7 @@ targets:
         min-ready: 5
         providers:
           - name: tripleo-test-cloud
+      - name: tripleo-f20
+        min-ready: 1
+        providers:
+          - name: tripleo-test-cloud