diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml
index aafc289b47..e6a86e8327 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -23,6 +23,8 @@ labels:
     min-ready: 1
   - name: fedora-30
     min-ready: 1
+  - name: fedora-31
+    min-ready: 1
   - name: gentoo-17-0-systemd
     min-ready: 1
   - name: opensuse-15
@@ -54,6 +56,8 @@ providers:
         config-drive: true
       - name: fedora-30
         config-drive: true
+      - name: fedora-31
+        config-drive: true
       - name: gentoo-17-0-systemd
         config-drive: true
       - name: opensuse-15
@@ -95,6 +99,11 @@ providers:
             flavor-name: 'Performance'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: 'Performance'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: 'Performance'
@@ -157,6 +166,7 @@ diskimages:
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index 94e895f040..7dba3e2a0e 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -18,6 +18,7 @@ labels:
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed
@@ -62,6 +63,8 @@ providers:
         config-drive: true
       - name: fedora-30
         config-drive: true
+      - name: fedora-31
+        config-drive: true
       - name: gentoo-17-0-systemd
         config-drive: true
       - name: opensuse-15
@@ -105,6 +108,11 @@ providers:
             flavor-name: '8C-8GB-100GB'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: '8C-8GB-100GB'
@@ -201,6 +209,11 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: 'nodepool.0'
@@ -278,6 +291,11 @@ providers:
             flavor-name: '8cpu-8GBram-80GBdisk'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: '8cpu-8GBram-80GBdisk'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: '8cpu-8GBram-80GBdisk'
@@ -385,6 +403,11 @@ providers:
             flavor-name: '8C-8GB-100GB'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: '8C-8GB-100GB'
@@ -434,6 +457,7 @@ diskimages:
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed
diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index 11d5700be5..3bc16ba63f 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -25,6 +25,7 @@ labels:
   - name: debian-stretch-arm64
     min-ready: 1
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed
@@ -71,6 +72,8 @@ providers:
         config-drive: true
       - name: fedora-30
         config-drive: true
+      - name: fedora-31
+        config-drive: true
       - name: gentoo-17-0-systemd
         config-drive: true
       - name: opensuse-15
@@ -110,6 +113,11 @@ providers:
             flavor-name: 'A1.8'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: 'A1.8'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: 'A1.8'
@@ -171,6 +179,11 @@ providers:
             flavor-name: 'osf-highcpu-8'
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: 'osf-highcpu-8'
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: 'osf-highcpu-8'
@@ -270,6 +283,13 @@ providers:
             volume-size: 80
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: v2-highcpu-8
+            boot-from-volume: true
+            volume-size: 80
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: v2-highcpu-8
@@ -409,6 +429,7 @@ diskimages:
   - name: debian-stretch
   - name: debian-stretch-arm64
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed
diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml
index 3c919a8459..43601a7756 100644
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@@ -18,6 +18,7 @@ labels:
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed
@@ -42,6 +43,8 @@ providers:
         config-drive: true
       - name: fedora-30
         config-drive: true
+      - name: fedora-31
+        config-drive: true
       - name: gentoo-17-0-systemd
         config-drive: true
       - name: opensuse-15
@@ -81,6 +84,11 @@ providers:
             flavor-name: ssd-osFoundation-3
             diskimage: fedora-30
             key-name: infra-root-keys-2018-06-15
+          - name: fedora-31
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: fedora-31
+            key-name: infra-root-keys-2018-06-15
           - name: gentoo-17-0-systemd
             min-ram: 8000
             flavor-name: ssd-osFoundation-3
@@ -125,6 +133,7 @@ diskimages:
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-30
+  - name: fedora-31
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: opensuse-tumbleweed