diff --git a/releasenotes/notes/centos8-stream-55d4100dcf3aaa8f.yaml b/releasenotes/notes/centos8-stream-55d4100dcf3aaa8f.yaml
deleted file mode 100644
index 8c30267..0000000
--- a/releasenotes/notes/centos8-stream-55d4100dcf3aaa8f.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-upgrade:
-  - |
-    Pre-built images are now built with CentOS Stream 8 instead of just CentOS.
diff --git a/roles/ipa-build-dib-image/tasks/main.yaml b/roles/ipa-build-dib-image/tasks/main.yaml
index 9392fca..bbec891 100644
--- a/roles/ipa-build-dib-image/tasks/main.yaml
+++ b/roles/ipa-build-dib-image/tasks/main.yaml
@@ -1,13 +1,13 @@
-- name: Default to CentOS Stream 8
+- name: Default to CentOS 8
   set_fact:
-    image_release: 8-stream
+    image_release: 8
   when:
     - image_distro in ["centos-minimal", "centos"]
     - not image_release
 
 - name: Generate a nice target name for CentOS
   set_fact:
-    image_target_name: centos{{ image_release | replace('-stream', '') }}
+    image_target_name: centos{{ image_release }}
   when:
     - image_distro in ["centos-minimal", "centos"]
     - not image_target_name
diff --git a/zuul.d/ironic-python-agent-builder-jobs.yaml b/zuul.d/ironic-python-agent-builder-jobs.yaml
index d054e27..817f9fd 100644
--- a/zuul.d/ironic-python-agent-builder-jobs.yaml
+++ b/zuul.d/ironic-python-agent-builder-jobs.yaml
@@ -37,7 +37,7 @@
     vars:
       image_type: 'dib'
       image_distro: 'centos'
-      image_release: 8-stream
+      image_release: 8
 
 - job:
     name: ironic-python-agent-check-image-base
@@ -95,7 +95,7 @@
     vars:
       image_type: 'dib'
       image_distro: 'centos'
-      image_release: 8-stream
+      image_release: 8
 
 - job:
     name: ironic-python-agent-check-image-dib-centos8-extra