diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml
index 4cf2c2c69a..a27c701f82 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -17,6 +17,8 @@ labels:
     min-ready: 1
   - name: centos-8
     min-ready: 1
+  - name: centos-8-stream
+    min-ready: 1
   - name: debian-buster
     min-ready: 1
   - name: debian-stretch
@@ -51,6 +53,8 @@ providers:
         config-drive: true
       - name: centos-8
         config-drive: true
+      - name: centos-8-stream
+        config-drive: true
       - name: debian-buster
         config-drive: true
       - name: debian-stretch
@@ -85,6 +89,11 @@ providers:
             flavor-name: 'Performance'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8192
+            flavor-name: 'Performance'
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: 'Performance'
@@ -163,6 +172,7 @@ providers:
 diskimages:
   - name: centos-7
   - name: centos-8
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-31
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index c8cd8c62c9..73ffa27346 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -15,6 +15,7 @@ zookeeper-servers:
 labels:
   - name: centos-7
   - name: centos-8
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-31
@@ -61,6 +62,8 @@ providers:
         config-drive: true
       - name: centos-8
         config-drive: true
+      - name: centos-8-stream
+        config-drive: true
       - name: debian-buster
         config-drive: true
       - name: debian-stretch
@@ -95,6 +98,11 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: 'nodepool.0'
@@ -192,6 +200,11 @@ providers:
             flavor-name: '8cpu-8GBram-80GBdisk'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: '8cpu-8GBram-80GBdisk'
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: '8cpu-8GBram-80GBdisk'
@@ -324,6 +337,11 @@ providers:
             flavor-name: '8C-8GB-100GB'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: '8C-8GB-100GB'
@@ -395,6 +413,7 @@ providers:
 diskimages:
   - name: centos-7
   - name: centos-8
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-31
diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index aa2d556f76..a61bbb70e0 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -22,6 +22,7 @@ labels:
     min-ready: 1
   - name: centos-8-arm64-large
     min-ready: 1
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-buster-arm64
     min-ready: 1
@@ -75,6 +76,8 @@ providers:
         config-drive: true
       - name: centos-8
         config-drive: true
+      - name: centos-8-stream
+        config-drive: true
       - name: debian-buster
         config-drive: true
       - name: debian-stretch
@@ -109,6 +112,11 @@ providers:
             flavor-name: 'A1.8'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: 'A1.8'
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: 'A1.8'
@@ -180,6 +188,11 @@ providers:
             flavor-name: 'osf-highcpu-8'
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: 'osf-highcpu-8'
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: 'osf-highcpu-8'
@@ -299,6 +312,13 @@ providers:
             volume-size: 80
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: v2-highcpu-8
+            boot-from-volume: true
+            volume-size: 80
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: v2-highcpu-8
@@ -466,6 +486,7 @@ diskimages:
   - name: centos-7
   - name: centos-8
   - name: centos-8-arm64
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-buster-arm64
   - name: debian-stretch
diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml
index f76344a17f..bf30af9862 100644
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@@ -15,6 +15,7 @@ zookeeper-servers:
 labels:
   - name: centos-7
   - name: centos-8
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-31
@@ -46,6 +47,8 @@ providers:
         config-drive: true
       - name: centos-8
         config-drive: true
+      - name: centos-8-stream
+        config-drive: true
       - name: debian-buster
         config-drive: true
       - name: debian-stretch
@@ -80,6 +83,11 @@ providers:
             flavor-name: ssd-osFoundation-3
             diskimage: centos-8
             key-name: infra-root-keys-2020-05-13
+          - name: centos-8-stream
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: centos-8-stream
+            key-name: infra-root-keys-2020-05-13
           - name: debian-buster
             min-ram: 8000
             flavor-name: ssd-osFoundation-3
@@ -166,6 +174,7 @@ providers:
 diskimages:
   - name: centos-7
   - name: centos-8
+  - name: centos-8-stream
   - name: debian-buster
   - name: debian-stretch
   - name: fedora-31
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 84ca4fd59b..9c0b8bc95a 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -19,6 +19,8 @@ providers:
         config-drive: true
       - name: centos-8
         config-drive: true
+      - name: centos-8-stream
+        config-drive: true
       - name: debian-buster
         config-drive: true
       - name: debian-stretch
@@ -155,6 +157,18 @@ diskimages:
     env-vars:
       DIB_EPEL_DISABLED: '1'
 
+  - name: centos-8-stream
+    parent: base
+    pause: false
+    python-path: /usr/bin/python3
+    release: '8-stream'
+    elements:
+      - cache-devstack
+      - centos-minimal
+      - epel
+    env-vars:
+      DIB_EPEL_DISABLED: '1'
+
   - name: fedora-31
     parent: base
     pause: false